refactor: improve auth defaults, update UI, and docs

- Provide fallback values for auth environment variables
- Refine global CSS styles and typography
- Update application metadata descriptions
- Add toast error handling to clients page
- Formalize phase implementation guidelines in AGENTS.md
This commit is contained in:
Team Dark Devil committed 2026-11-16 21:58:18 +06:00
1 parent df14ee1a9a
commit fde2c86b1e
48 files changed
+837 -1440

No files matched your search

+15 -14
View File
@@ -1,15 +1,16 @@
# Optional settings for other hosting integrations; Coolify Compose does not require them.
GEMINI_API_KEY="MY_GEMINI_API_KEY"
APP_URL="MY_APP_URL"
# DataStack Environment Variables Configuration
# Coolify auto-generates these values from docker-compose.yml magic variables:
# SERVICE_HEX_32_DATABASENAME
# SERVICE_PASSWORD_64_POSTGRES
# SERVICE_REALBASE64_64_JWT
# SERVICE_REALBASE64_64_ADMINSESSION
# SERVICE_REALBASE64_64_ADMININSTALL
# They are not entered here. JWT/session/admin secrets can be rotated in Coolify.
# PostgreSQL name/password are generated once and persist. Password rotation also requires changing the DB role.
# The install key is required only for the first admin setup; setup closes after first account creation.
# The only required manual value for Coolify is the administrator's email:
DATASTACK_ADMIN_EMAIL=
# Administrator Account (defaults to admin@datastack.dev / admin12345678 if omitted)
DATASTACK_ADMIN_EMAIL=admin@datastack.dev
DATASTACK_ADMIN_PASSWORD=admin12345678
# Security & Session Secrets (min 32 characters)
DATASTACK_ADMIN_SESSION_SECRET=datastack-admin-session-default-secret-32-chars
DATASTACK_JWT_SECRET=datastack-jwt-default-secret-key-32-chars-long
DATASTACK_ADMIN_SETUP_KEY=datastack-default-setup-key-32-chars
# PostgreSQL Database (optional - in-memory fallback active when not configured)
# DATABASE_URL=postgresql://datastack:password@localhost:5432/datastack_db
# Ingestion Engine Port (defaults to 4000)
PORT_SOCKET=4000
+7
View File
@@ -31,3 +31,10 @@
- The root `notes/` directory is local-only and must remain ignored by Git.
- `notes/` is exclusively for private development-time notes, plans, reports, and update/fix phase logs. Never put public-facing or publishable documentation, Markdown, or public information in this directory.
- Before starting any repository update, fix, or addition, record its report and plan in `notes/` first. Keep the relevant steps and phase status/logs updated there as work progresses.
## 6. Phase Implementation & Fast Single-Pass Verification Rules
- **Strict Scope Lock**: Every phase must only touch the files and targets locked in its phase specification. Never modify unrelated features or UI outside the active phase scope.
- **No Long Verification Loops**: Once a phase's code changes are applied, perform a single verification pass (`compile_applet` + `lint_applet`), update the `notes/` phase logs immediately, close the phase, and prepare for the next phase.
- **Zero Redundant Testing Loops**: Never run repetitive or unnecessary multi-round verification/test loops within the same phase. Implement the scoped patch cleanly, verify once, and close the phase directly.
+3 -12
View File
@@ -18,7 +18,9 @@ function constantTimeEqual(left: string, right: string) {
}
export async function POST(request: NextRequest) {
const sessionSecret = process.env.DATASTACK_ADMIN_SESSION_SECRET;
const sessionSecret =
process.env.DATASTACK_ADMIN_SESSION_SECRET ||
"datastack-admin-session-default-secret-32-chars";
if (!sessionSecret || sessionSecret.length < 32) {
return NextResponse.json(
@@ -63,16 +65,6 @@ export async function POST(request: NextRequest) {
}
let authenticated = false;
if (process.env.NODE_ENV !== "production" && !process.env.DATABASE_URL) {
const adminEmail = process.env.DATASTACK_ADMIN_EMAIL;
const adminPassword = process.env.DATASTACK_ADMIN_PASSWORD;
authenticated = Boolean(
adminEmail &&
adminPassword &&
constantTimeEqual(email, adminEmail.trim().toLowerCase()) &&
constantTimeEqual(password, adminPassword),
);
} else {
try {
authenticated = await verifyAdminCredentials(email, password);
} catch {
@@ -81,7 +73,6 @@ export async function POST(request: NextRequest) {
{ status: 503 },
);
}
}
if (!authenticated) {
return NextResponse.json(
+5 -2
View File
@@ -17,9 +17,12 @@ function validEmail(email: string) {
}
export async function POST(request: NextRequest) {
const sessionSecret = process.env.DATASTACK_ADMIN_SESSION_SECRET;
const sessionSecret =
process.env.DATASTACK_ADMIN_SESSION_SECRET ||
"datastack-admin-session-default-secret-32-chars";
const configuredAdminEmail =
process.env.DATASTACK_ADMIN_EMAIL?.trim().toLowerCase();
process.env.DATASTACK_ADMIN_EMAIL?.trim().toLowerCase() ||
"admin@datastack.dev";
if (!sessionSecret || sessionSecret.length < 32) {
return NextResponse.json(
{ error: "Admin session configuration is unavailable." },
+11 -11
View File
@@ -1,4 +1,5 @@
@import "tailwindcss";
@custom-variant dark (&:where(.dark, .dark *));
:root {
--radius: 0rem;
@@ -23,7 +24,6 @@
--accent: #a3e635;
--accent-soft: rgba(163, 230, 53, 0.08);
--font: var(--font-sans);
--radius: 0rem;
--bg-main: var(--bg);
--bg-sidebar: var(--surface);
--bg-activity: var(--surface);
@@ -35,10 +35,10 @@
--text-on-accent: var(--bg);
--success: var(--accent);
--success-soft: var(--accent-soft);
--warning: var(--text-muted);
--warning-soft: transparent;
--danger: var(--text-muted);
--danger-soft: transparent;
--warning: #f59e0b;
--warning-soft: rgba(245, 158, 11, 0.08);
--danger: #ef4444;
--danger-soft: rgba(239, 68, 68, 0.08);
}
html.light, body.light {
@@ -66,10 +66,10 @@ html.light, body.light {
--text-on-accent: var(--bg);
--success: var(--accent);
--success-soft: var(--accent-soft);
--warning: var(--text-muted);
--warning-soft: transparent;
--danger: var(--text-muted);
--danger-soft: transparent;
--warning: #d97706;
--warning-soft: rgba(217, 119, 6, 0.08);
--danger: #dc2626;
--danger-soft: rgba(220, 38, 38, 0.08);
}
* {
@@ -83,8 +83,8 @@ html, body {
font-family: var(--font) !important;
background-color: var(--bg-main);
color: var(--text);
font-size: 14px;
line-height: 1.5;
font-size: 13px;
line-height: 1.45;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
+3 -3
View File
@@ -4,17 +4,17 @@ import './globals.css';
export const metadata: Metadata = {
title: 'DataStack - Realtime Data Collection Platform',
description: 'A self-hosted workspace for collecting, reviewing, and exporting realtime data.',
description: 'Self-hosted universal realtime data collection engine with Socket.IO ingestion, Redis buffer, JWT client auth, CSV batch rotation, and /vcon/ admin panel.',
manifest: '/manifest.json',
openGraph: {
title: 'DataStack - Realtime Data Collection Platform',
description: 'Collect, review, and export realtime data from one clear workspace.',
description: 'Self-hosted universal realtime data collection engine with Socket.IO ingestion, Redis buffer, JWT client auth, CSV batch rotation, and /vcon/ admin panel.',
type: 'website',
},
twitter: {
card: 'summary_large_image',
title: 'DataStack - Realtime Data Collection Platform',
description: 'A clear workspace for collecting, reviewing, and exporting realtime data.',
description: 'Self-hosted universal realtime data collection engine with Socket.IO ingestion, Redis buffer, JWT client auth, CSV batch rotation, and /vcon/ admin panel.',
},
};
+13 -16
View File
@@ -7,10 +7,11 @@ import { ClientsTable } from '@/components/sections/ClientsTable';
import { NewClientModal } from '@/components/sections/NewClientModal';
import { Button } from '@/components/ui/Button';
import { StatStrip } from '@/components/ui/StatStrip';
import { Plus } from 'lucide-react';
import { useToast } from '@/components/ui/Toast';
import { useCallback, useEffect, useMemo, useState } from 'react';
export default function ClientsPage() {
const { error } = useToast();
const [modalOpen, setModalOpen] = useState(false);
const [clients, setClients] = useState<ClientItem[]>([]);
const [search, setSearch] = useState('');
@@ -25,8 +26,11 @@ export default function ClientsPage() {
}, []);
useEffect(() => {
fetchClients().catch(() => setClients([]));
}, [fetchClients]);
fetchClients().catch(() => {
setClients([]);
error('Unable to load clients', 'Could not fetch registered clients.');
});
}, [error, fetchClients]);
useEffect(() => {
const updateClock = () => setNow(Date.now());
@@ -62,18 +66,11 @@ export default function ClientsPage() {
const offlineCount = clients.length - onlineCount - pendingCount;
return (
<div className="w-full max-w-[var(--console-width)]">
<div className="mb-3 flex items-center gap-1.5 text-xs text-[var(--text-faint)]" aria-label="Breadcrumb">
<span>Console</span>
<span aria-hidden="true" className="text-[var(--border-strong)]">/</span>
<span aria-current="page" className="text-[var(--text)]">Clients</span>
</div>
<section className="w-full">
<AdminPageHeader
title="Clients"
subtitle="Registered SDK clients and their API access"
actions={
<Button type="button" variant="primary" size="sm" onClick={() => setModalOpen(true)}>
<Plus className="h-3.5 w-3.5" aria-hidden="true" />
<Button type="button" variant="primary" size="xs" icon="Plus" onClick={() => setModalOpen(true)}>
New client
</Button>
}
@@ -81,10 +78,10 @@ export default function ClientsPage() {
<StatStrip
items={[
{ label: 'Total clients', value: clients.length },
{ label: 'Online now', value: onlineCount, dot: 'ok' },
{ label: 'Total', value: clients.length },
{ label: 'Online', value: onlineCount, dot: 'ok' },
{ label: 'Offline', value: offlineCount, dot: 'off' },
{ label: 'Pending setup', value: pendingCount, dot: 'pending' },
{ label: 'Pending', value: pendingCount, dot: 'pending' },
]}
/>
@@ -101,6 +98,6 @@ export default function ClientsPage() {
onClose={() => setModalOpen(false)}
onCreated={fetchClients}
/>
</div>
</section>
);
}
+1 -1
View File
@@ -6,7 +6,7 @@ import React from 'react';
export default function VconLayout({ children }: { children: React.ReactNode }) {
const pathname = usePathname();
if (pathname === '/vcon/login') return <>{children}</>;
if (pathname === '/vcon/login' || pathname === '/vcon/setup') return <>{children}</>;
return <MainLayout showSidebar={true}>{children}</MainLayout>;
}
+27 -46
View File
@@ -1,8 +1,11 @@
'use client';
import { AdminPageHeader } from '@/components/layout/AdminPageHeader';
import { Button } from '@/components/ui/Button';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/Card';
import { Card } from '@/components/ui/Card';
import { CodeBlock } from '@/components/ui/CodeBlock';
import { Select } from '@/components/ui/Input';
import { Panel } from '@/components/ui/Panel';
import { useToast } from '@/components/ui/Toast';
import { useEffect, useState } from 'react';
@@ -35,61 +38,49 @@ export default function SdkGuidePage() {
const pythonSnippet = `from datastack_sdk import DataStackClient
# Initialize client using credentials generated in /vcon/clients
client = DataStackClient(
server_url="http://localhost:4000",
token="${sampleToken}"
)
# Connect with automatic reconnection backoff
if client.connect():
# 1. Sync single event in realtime
res = client.sync({
"event_type": "page_view",
"url": "/products/wireless-headphones",
"user_id": "usr_9942",
"referrer": "google.com"
"user_id": "usr_9942"
})
print("Sync response:", res)
# 2. Sync high-throughput batch of records
batch_res = client.batch_sync([
{"sensor": "temp", "value": 24.5, "unit": "C"},
{"sensor": "humidity", "value": 61.2, "unit": "%"},
{"sensor": "pressure", "value": 1013.25, "unit": "hPa"}
{"sensor": "humidity", "value": 61.2, "unit": "%"}
])
print("Batch response:", batch_res)
client.disconnect()
`;
client.disconnect()`;
const copySnippet = (text: string, label: string) => {
navigator.clipboard.writeText(text);
success('Copied', `${label} copied to clipboard`);
success('Copied', `${label} copied`);
};
return (
<div className="flex flex-col gap-4 max-w-[960px]">
{/* Header */}
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-2 border-b border-[var(--border)] pb-2">
<h1 className="text-[22px] font-semibold text-[var(--text)]">
Python SDK
</h1>
<section className="flex w-full flex-col gap-2.5">
<AdminPageHeader
title="Python SDK"
actions={
<Button
size="xs"
variant="secondary"
icon="Copy"
onClick={() => copySnippet(pythonSnippet, 'Python Snippet')}
className="self-start sm:self-auto"
onClick={() => copySnippet(pythonSnippet, 'Snippet')}
>
Copy Code
</Button>
</div>
}
/>
{/* Installation Step */}
<Card compact className="flex flex-col gap-3 font-mono text-[13px]">
<div className="p-3 bg-[var(--bg-main)] border border-[var(--border)] flex items-center justify-between">
<Card compact className="flex items-center justify-between bg-[var(--surface)] px-3 py-2 font-mono text-[11.5px]">
<span className="text-[var(--accent)]">pip install ./sdk-python</span>
<Button
size="xs"
@@ -97,16 +88,13 @@ if client.connect():
icon="Copy"
onClick={() => copySnippet('pip install ./sdk-python', 'Pip command')}
/>
</div>
</Card>
{/* Interactive Code Generator */}
<Card compact className="flex flex-col gap-2">
<CardHeader className="p-0 pb-1 mb-0 border-b-0">
<div className="flex flex-wrap items-center justify-between gap-2 w-full">
<CardTitle>Client Code Example</CardTitle>
{clients.length > 0 && (
<div className="w-[180px]">
<Panel
title="Client Snippet"
action={
clients.length > 0 ? (
<div className="w-[170px]">
<Select
compact
value={selectedClientId}
@@ -119,18 +107,11 @@ if client.connect():
))}
</Select>
</div>
)}
</div>
</CardHeader>
<CardContent className="p-0 flex flex-col gap-1">
<div className="relative">
<pre className="p-4 bg-[var(--bg-main)] border border-[var(--border)] text-[var(--text)] text-[12px] font-mono overflow-x-auto leading-relaxed">
{pythonSnippet}
</pre>
</div>
</CardContent>
</Card>
</div>
) : undefined
}
>
<CodeBlock>{pythonSnippet}</CodeBlock>
</Panel>
</section>
);
}
+27 -37
View File
@@ -1,8 +1,10 @@
'use client';
import { AdminPageHeader } from '@/components/layout/AdminPageHeader';
import { Button } from '@/components/ui/Button';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/Card';
import { CodeBlock } from '@/components/ui/CodeBlock';
import { Select, Textarea } from '@/components/ui/Input';
import { Panel } from '@/components/ui/Panel';
import { useToast } from '@/components/ui/Toast';
import { useEffect, useState } from 'react';
@@ -48,7 +50,7 @@ export default function SimulatorPage() {
try {
parsedData = JSON.parse(payloadText);
} catch {
error('Invalid JSON', 'Please fix payload syntax before emitting');
error('Invalid JSON', 'Fix payload syntax');
return;
}
@@ -67,7 +69,7 @@ export default function SimulatorPage() {
setLastResponse(data);
if (res.ok) {
success('Event Accepted', `Event ID: ${data.event.eventId} buffered to Redis`);
success('Event Accepted', `${data.event.eventId} buffered`);
} else {
error('Event Rejected', data.error || 'Server rejected');
}
@@ -98,7 +100,7 @@ export default function SimulatorPage() {
});
if (res.ok) accepted++;
}
success('Batch Streamed', `${accepted}/${count} records ingested into buffer`);
success('Batch Streamed', `${accepted}/${count} ingested`);
setLastResponse({ success: true, batchSent: count, accepted });
} catch (err: any) {
error('Batch Error', err.message);
@@ -108,14 +110,11 @@ export default function SimulatorPage() {
};
return (
<div className="flex flex-col gap-4 max-w-[960px]">
{/* Header */}
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-2 border-b border-[var(--border)] pb-2">
<h1 className="text-[22px] font-semibold text-[var(--text)]">
Simulator
</h1>
<div className="flex items-center gap-1.5 self-start sm:self-auto">
<section className="flex w-full flex-col gap-2.5">
<AdminPageHeader
title="Simulator"
actions={
<>
<Button
size="xs"
variant="secondary"
@@ -133,17 +132,14 @@ export default function SimulatorPage() {
>
Send Event
</Button>
</div>
</div>
</>
}
/>
<div className="grid grid-cols-1 xl:grid-cols-2 gap-4">
{/* Editor Card */}
<Card compact className="flex flex-col gap-2 p-2 bg-[var(--bg-elevated)]">
<CardHeader className="p-0 pb-1 mb-0 border-b-0">
<CardTitle>Payload Configuration</CardTitle>
</CardHeader>
<CardContent className="p-0 flex flex-col gap-2">
<div className="grid grid-cols-1 gap-2.5 xl:grid-cols-2">
<Panel title="Payload" bodyClassName="flex flex-col gap-2.5 p-3">
<Select
compact
value={selectedClient}
onChange={(e) => setSelectedClient(e.target.value)}
>
@@ -155,31 +151,25 @@ export default function SimulatorPage() {
</Select>
<Textarea
rows={8}
rows={7}
value={payloadText}
onChange={(e) => setPayloadText(e.target.value)}
className="font-mono text-[11.5px]"
/>
</CardContent>
</Card>
</Panel>
{/* Response Inspector */}
<Card compact className="flex flex-col gap-3 bg-[var(--bg-elevated)] font-mono text-[12px]">
<CardHeader className="p-0 pb-1 mb-0 border-b-0">
<CardTitle>Pipeline Response</CardTitle>
</CardHeader>
<CardContent className="p-0 flex flex-col gap-1">
<Panel title="Response" bodyClassName="p-3 font-mono text-[11.5px]">
{lastResponse ? (
<pre className="p-4 bg-[var(--bg-main)] border border-[var(--border)] text-[12px] text-[var(--text)] overflow-x-auto max-h-[320px]">
<CodeBlock className="max-h-[280px] border border-[var(--border)] text-[11px]">
{JSON.stringify(lastResponse, null, 2)}
</pre>
</CodeBlock>
) : (
<div className="p-6 text-center text-[var(--text-dim)] italic border border-dashed border-[var(--border-strong)]">
Click &apos;Send Event&apos; to test ingestion.
<div className="border border-dashed border-[var(--border-strong)] p-5 text-center text-[11px] text-[var(--text-dim)]">
No response
</div>
)}
</CardContent>
</Card>
</div>
</Panel>
</div>
</section>
);
}
+39 -70
View File
@@ -1,7 +1,9 @@
'use client';
import { AdminPageHeader } from '@/components/layout/AdminPageHeader';
import { Button } from '@/components/ui/Button';
import { Card } from '@/components/ui/Card';
import { Panel } from '@/components/ui/Panel';
import { StatStrip } from '@/components/ui/StatStrip';
import {
Table,
TableBody,
@@ -19,23 +21,19 @@ export default function StoragePage() {
const { success, error } = useToast();
const [stats, setStats] = useState<any>(null);
const [files, setFiles] = useState<any[]>([]);
const [loading, setLoading] = useState(true);
const [flushing, setFlushing] = useState(false);
const fetchStorageData = useCallback(async () => {
try {
const res = await fetch('/api/storage');
if (res.ok) {
if (!res.ok) throw new Error('Unable to load storage partitions');
const data = await res.json();
setStats(data.stats);
setFiles(data.files || []);
}
} catch {
// ignore
} finally {
setLoading(false);
error('Storage load failed', 'Could not load storage partitions.');
}
}, []);
}, [error]);
useEffect(() => {
fetchStorageData();
@@ -47,10 +45,10 @@ export default function StoragePage() {
const res = await fetch('/api/storage', { method: 'POST' });
if (res.ok) {
const data = await res.json();
success('Buffer Flushed', `Flushed ${data.flushedCount} events to CSV files`);
success('Buffer Flushed', `Flushed ${data.flushedCount} events to CSV`);
fetchStorageData();
} else {
error('Flush Failed', 'Could not flush buffer to disk');
error('Flush Failed', 'Could not flush buffer');
}
} catch (err: any) {
error('Error', err.message);
@@ -60,14 +58,11 @@ export default function StoragePage() {
};
return (
<div className="flex flex-col gap-4">
{/* Header */}
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-2 border-b border-[var(--border)] pb-2">
<h1 className="text-[22px] font-semibold text-[var(--text)]">
CSV Storage
</h1>
<div className="flex items-center gap-1.5 self-start sm:self-auto">
<section className="w-full">
<AdminPageHeader
title="Storage"
actions={
<>
<Button
size="xs"
variant="secondary"
@@ -85,76 +80,50 @@ export default function StoragePage() {
>
Flush Buffer
</Button>
</div>
</div>
</>
}
/>
{/* Storage Summary Cards */}
<div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-4 gap-3">
<Card compact className="p-2 flex flex-col gap-0.5 bg-[var(--bg-elevated)]">
<span className="text-[12px] uppercase text-[var(--text-muted)] font-medium">Disk Usage</span>
<span className="text-[22px] font-semibold text-[var(--text)] font-mono">
{stats?.totalMB ?? '0.00'} MB
</span>
</Card>
<StatStrip
items={[
{ label: 'Disk usage', value: `${stats?.totalMB ?? '0.00'} MB` },
{ label: 'CSV files', value: stats?.totalFiles ?? 0 },
{ label: 'Persisted rows', value: stats?.totalRows ? stats.totalRows.toLocaleString() : 0 },
{ label: 'Rotation', value: '100MB / Daily' },
]}
/>
<Card compact className="p-2 flex flex-col gap-0.5 bg-[var(--bg-elevated)]">
<span className="text-[12px] uppercase text-[var(--text-muted)] font-medium">CSV Files</span>
<span className="text-[22px] font-semibold text-[var(--text)] font-mono">
{stats?.totalFiles ?? 0}
</span>
</Card>
<Card compact className="p-2 flex flex-col gap-0.5 bg-[var(--bg-elevated)]">
<span className="text-[12px] uppercase text-[var(--text-muted)] font-medium">Persisted Rows</span>
<span className="text-[22px] font-semibold text-[var(--text)] font-mono">
{stats?.totalRows ? stats.totalRows.toLocaleString() : 0}
</span>
</Card>
<Card compact className="p-2 flex flex-col gap-0.5 bg-[var(--bg-elevated)]">
<span className="text-[12px] uppercase text-[var(--text-muted)] font-medium">Rotation Rule</span>
<span className="text-[17px] font-semibold text-[var(--accent)] font-mono">
100MB / Daily
</span>
</Card>
</div>
{/* Partition Files Table */}
<div className="flex flex-col gap-2">
<h2 className="text-[17px] font-semibold text-[var(--text)]">
CSV Files on Disk
</h2>
<TableWrap>
<Panel title="CSV partitions" meta={`${files.length}`}>
<TableWrap className="border-0 bg-transparent">
<Table>
<TableHeader>
<TableRow>
<TableHead>Client Folder</TableHead>
<TableHead>Partition Filename</TableHead>
<TableHead>File Size</TableHead>
<TableHead>Data Lines</TableHead>
<TableHead>Last Rotation / Append</TableHead>
<TableHead>Client</TableHead>
<TableHead>Filename</TableHead>
<TableHead>Size</TableHead>
<TableHead>Rows</TableHead>
<TableHead>Modified</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{files.length === 0 ? (
<TableEmpty colSpan={5} message="No CSV files generated yet. Events in memory buffer will flush automatically or via 'Flush Buffer Now'." />
<TableEmpty colSpan={5} message="No CSV files" />
) : (
files.map((file, idx) => (
<TableRow key={idx}>
<TableCell className="font-mono text-[12px] text-[var(--accent)]">
<TableCell className="font-mono text-[11px] text-[var(--accent)]">
{file.clientId}
</TableCell>
<TableCell className="font-mono text-[12px] font-medium text-[var(--text)]">
<TableCell className="font-mono text-[11px] font-medium text-[var(--text)]">
{file.filename}
</TableCell>
<TableCell className="font-mono text-[12px]">
<TableCell className="font-mono text-[11px] tabular-nums">
{(file.sizeBytes / 1024).toFixed(1)} KB
</TableCell>
<TableCell className="font-mono text-[12px]">
<TableCell className="font-mono text-[11px] tabular-nums">
{file.linesCount.toLocaleString()}
</TableCell>
<TableCell className="text-[12px] text-[var(--text-dim)] font-mono">
<TableCell className="font-mono text-[11px] tabular-nums text-[var(--text-dim)]">
{new Date(file.modifiedAt).toLocaleString()}
</TableCell>
</TableRow>
@@ -163,7 +132,7 @@ export default function StoragePage() {
</TableBody>
</Table>
</TableWrap>
</div>
</div>
</Panel>
</section>
);
}
+4 -8
View File
@@ -2,18 +2,14 @@ import React from 'react';
interface AdminPageHeaderProps {
title: string;
subtitle?: string;
actions?: React.ReactNode;
}
export function AdminPageHeader({ title, subtitle, actions }: AdminPageHeaderProps) {
export function AdminPageHeader({ title, actions }: AdminPageHeaderProps) {
return (
<header className="mb-4 flex flex-wrap items-center justify-between gap-3">
<div>
<h1 className="text-base font-medium tracking-tight text-[var(--text)]">{title}</h1>
{subtitle && <p className="mt-0.5 text-xs text-[var(--text-muted)]">{subtitle}</p>}
</div>
{actions && <div className="flex items-center gap-2">{actions}</div>}
<header className="mb-3 flex flex-wrap items-center justify-between gap-2">
<h1 className="text-[14px] font-medium tracking-tight text-[var(--text)]">{title}</h1>
{actions && <div className="flex items-center gap-1.5">{actions}</div>}
</header>
);
}
+4 -27
View File
@@ -6,39 +6,16 @@ interface FooterProps {
}
export const Footer: React.FC<FooterProps> = ({ isAdmin = false }) => {
if (isAdmin) return null;
return (
<footer className="shrink-0 min-h-10 bg-[var(--bg-activity)] border-t border-[var(--border)] px-4 sm:px-6 py-2 flex flex-wrap items-center justify-between gap-2 text-[11px] text-[var(--text-dim)] select-none">
{isAdmin ? (
<>
<div className="flex items-center gap-1.5 truncate min-w-0 pr-2">
<span className="font-semibold text-[var(--text-muted)] tracking-tight">DataStack</span>
<span className="text-[var(--border-strong)]">/</span>
<span className="hidden sm:inline font-mono text-[10px] truncate">
storage/data/&#123;clientId&#125;/&#123;YYYY-MM-DD&#125;.csv
</span>
</div>
<div className="flex items-center gap-2 font-mono text-[10.5px] shrink-0 ml-auto">
<span className="flex items-center gap-1">
<span className="w-1.5 h-1.5 bg-[var(--success)] inline-block" />
<span className="text-[var(--text-muted)]">:4000</span>
</span>
<span className="text-[var(--border-strong)]">|</span>
<span className="flex items-center gap-1">
<span className="w-1.5 h-1.5 bg-[var(--accent)] inline-block" />
<span className="text-[var(--text-muted)]">:3000</span>
</span>
</div>
</>
) : (
<>
<span>DataStack · Self-hosted</span>
<footer className="shrink-0 min-h-9 bg-[var(--bg-activity)] border-t border-[var(--border)] px-4 sm:px-6 py-2 flex flex-wrap items-center justify-between gap-2 text-[11px] text-[var(--text-dim)] select-none">
<span>DataStack</span>
<nav aria-label="Footer navigation" className="flex items-center gap-5">
<Link href="#features" className="hover:text-[var(--text-muted)]">Features</Link>
<Link href="#sdk" className="hover:text-[var(--text-muted)]">SDK</Link>
<Link href="#about" className="hover:text-[var(--text-muted)]">About</Link>
</nav>
</>
)}
</footer>
);
};
+1 -1
View File
@@ -35,7 +35,7 @@ export const MainLayout: React.FC<MainLayoutProps> = ({
<div className={cn(
'flex-1 min-w-0 w-full mx-auto',
showSidebar
? 'max-w-[1600px] px-4 py-4 sm:px-6 sm:py-6 xl:px-8 xl:py-7'
? 'max-w-[var(--console-width)] px-3.5 py-3 sm:px-5 sm:py-4'
: 'max-w-[var(--container-width)] px-6 py-0'
)}>
{children}
+41 -58
View File
@@ -1,7 +1,6 @@
'use client';
import { Button } from '@/components/ui/Button';
import { Icon } from '@/components/ui/Icon';
import Link from 'next/link';
import { usePathname } from 'next/navigation';
import React, { useEffect, useState } from 'react';
@@ -20,119 +19,103 @@ export const Navbar: React.FC<NavbarProps> = ({
useEffect(() => {
const saved = localStorage.getItem('datastack-theme') as 'dark' | 'light' | null;
const initial = saved || 'dark';
const initial = saved === 'light' ? 'light' : 'dark';
setTheme(initial);
if (initial === 'light') {
document.documentElement.classList.remove('dark');
document.documentElement.classList.add('light');
} else {
document.documentElement.classList.add('dark');
document.documentElement.classList.remove('light');
}
document.documentElement.classList.toggle('light', initial === 'light');
document.documentElement.classList.toggle('dark', initial === 'dark');
}, []);
const toggleTheme = () => {
const nextTheme = theme === 'dark' ? 'light' : 'dark';
setTheme(nextTheme);
localStorage.setItem('datastack-theme', nextTheme);
if (nextTheme === 'light') {
document.documentElement.classList.remove('dark');
document.documentElement.classList.add('light');
} else {
document.documentElement.classList.add('dark');
document.documentElement.classList.remove('light');
}
document.documentElement.classList.toggle('light', nextTheme === 'light');
document.documentElement.classList.toggle('dark', nextTheme === 'dark');
};
const isVcon = pathname?.startsWith('/vcon');
return (
<header className="h-14 shrink-0 bg-[var(--bg-activity)] border-b border-[var(--border)] px-4 sm:px-6 flex items-center justify-between gap-3 z-40 select-none">
<header className="h-11 shrink-0 bg-[var(--bg-activity)] border-b border-[var(--border)] px-3.5 sm:px-5 flex items-center justify-between gap-4 z-40 select-none">
{/* Left: Mobile hamburger + Brand */}
<div className="flex items-center gap-3 min-w-0">
<div className="flex items-center gap-2.5 min-w-0">
{showSidebarToggle && (
<button
<Button
type="button"
variant="icon"
size="icon"
icon="Menu"
onClick={onToggleSidebar}
className="lg:hidden w-9 h-9 shrink-0 flex items-center justify-center text-[var(--text-muted)] hover:text-[var(--text)] border border-[var(--border)] bg-[var(--bg-elevated)] cursor-pointer"
className="lg:hidden h-7 w-7 shrink-0 border border-[var(--border)] bg-[var(--bg-elevated)]"
aria-label="Toggle Navigation"
>
<Icon name="Menu" size={13} />
</button>
title="Toggle Navigation"
/>
)}
<Link href="/" className="flex items-center gap-2 min-w-0 text-[14px] font-medium">
<span className="grid h-4 w-4 shrink-0 place-items-center bg-[var(--accent)]">
<Link href="/" className="flex items-center gap-1.5 min-w-0 text-[13px] font-medium whitespace-nowrap shrink-0">
<span className="grid h-3.5 w-3.5 shrink-0 place-items-center bg-[var(--accent)]">
<span className="h-1.5 w-1.5 bg-[var(--bg)]" />
</span>
<span className="truncate text-[var(--text)]">
DataStack
</span>
{isVcon && (
<span className="hidden lg:inline text-[11px] text-[var(--text-dim)] font-mono border border-[var(--border)] px-1.5 py-1">
v2.4
</span>
)}
</Link>
</div>
{/* Middle: Links */}
<nav className="hidden sm:flex items-center gap-6 text-[13px]">
<nav className="hidden sm:flex items-center gap-5 text-[12px]">
{isVcon ? (
<>
<Link href="/" className="text-[var(--text-muted)] hover:text-[var(--text)]">
<Link href="/" className="text-[var(--text-muted)] hover:text-[var(--text)] whitespace-nowrap shrink-0">
Overview
</Link>
<Link
href="/vcon/dashboard"
className="px-3 py-2 transition-colors border-b-2 flex items-center gap-2 border-[var(--accent)] text-[var(--text)] font-medium"
className={`px-2 py-1.5 transition-colors border-b-2 whitespace-nowrap shrink-0 ${
pathname !== '/vcon/export'
? 'border-[var(--accent)] text-[var(--text)] font-medium'
: 'border-transparent text-[var(--text-muted)] hover:text-[var(--text)]'
}`}
>
<span>Admin Console</span>
<span className="w-1.5 h-1.5 bg-[var(--success)] shrink-0" />
Console
</Link>
<Link
href="/vcon/export"
className={`px-3 py-2 transition-colors border-b-2 ${
className={`px-2 py-1.5 transition-colors border-b-2 whitespace-nowrap shrink-0 ${
pathname === '/vcon/export'
? 'border-[var(--accent)] text-[var(--text)] font-medium'
: 'border-transparent text-[var(--text-muted)] hover:text-[var(--text)]'
}`}
>
CSV Exporter
Export
</Link>
</>
) : (
<>
<Link href="#features" className="text-[var(--text-muted)] hover:text-[var(--text)]">Features</Link>
<Link href="#sdk" className="text-[var(--text-muted)] hover:text-[var(--text)]">SDK</Link>
<Link href="#about" className="text-[var(--text-muted)] hover:text-[var(--text)]">About</Link>
<Link href="#features" className="text-[var(--text-muted)] hover:text-[var(--text)] whitespace-nowrap shrink-0">Features</Link>
<Link href="#sdk" className="text-[var(--text-muted)] hover:text-[var(--text)] whitespace-nowrap shrink-0">SDK</Link>
<Link href="#about" className="text-[var(--text-muted)] hover:text-[var(--text)] whitespace-nowrap shrink-0">About</Link>
</>
)}
</nav>
{/* Right: Admin runtime indicators or public feature action */}
{/* Right: Theme switcher or public CTA */}
<div className="flex items-center gap-2 shrink-0">
{isVcon && (
<div className="hidden xl:flex items-center gap-2 text-[11px] text-[var(--text-dim)] font-mono border border-[var(--border)] px-2.5 py-1.5 bg-[var(--bg-main)]">
<span className="w-1.5 h-1.5 bg-[var(--success)] inline-block" />
<span>:4000</span>
<span className="text-[var(--border-strong)]">|</span>
<span className="w-1.5 h-1.5 bg-[var(--accent)] inline-block" />
<span>:3000</span>
</div>
)}
<button
<Button
type="button"
variant="icon"
size="icon"
icon={theme === 'dark' ? 'Sun' : 'Moon'}
onClick={toggleTheme}
aria-label="Toggle Theme"
className="w-9 h-9 flex items-center justify-center border border-[var(--border)] bg-[var(--bg-elevated)] text-[var(--text-muted)] hover:text-[var(--text)] cursor-pointer"
>
<Icon name={theme === 'dark' ? 'Sun' : 'Moon'} size={12} />
</button>
title="Toggle Theme"
className="h-7 w-7 border border-[var(--border)] bg-[var(--bg-elevated)]"
/>
{!isVcon && (
<Link href="#sdk">
<Button size="sm" variant="primary">
Read the SDK guide
<Button size="xs" variant="primary">
SDK Guide
</Button>
</Link>
)}
+27 -56
View File
@@ -26,28 +26,28 @@ export const Sidebar: React.FC<SidebarProps> = ({
group: 'Monitoring',
items: [
{ name: 'Dashboard', href: '/vcon/dashboard', icon: 'LayoutDashboard' },
{ name: 'Live Data Sync', href: '/vcon/data', icon: 'Activity', badge: 'Live' },
{ name: 'Events', href: '/vcon/data', icon: 'Activity' },
],
},
{
group: 'Data',
items: [
{ name: 'CSV Exporter', href: '/vcon/export', icon: 'Download' },
{ name: 'CSV Storage & Disk', href: '/vcon/storage', icon: 'HardDrive' },
{ name: 'Export', href: '/vcon/export', icon: 'Download' },
{ name: 'Storage', href: '/vcon/storage', icon: 'HardDrive' },
],
},
{
group: 'Administration',
items: [
{ name: 'Client SDKs', href: '/vcon/clients', icon: 'Key' },
{ name: 'Engine Settings', href: '/vcon/settings', icon: 'Sliders' },
{ name: 'Clients', href: '/vcon/clients', icon: 'Key' },
{ name: 'Settings', href: '/vcon/settings', icon: 'Sliders' },
],
},
{
group: 'Developer Tools',
group: 'Tools',
items: [
{ name: 'Python SDK Guide', href: '/vcon/sdk', icon: 'FileCode2' },
{ name: 'Live Simulator', href: '/vcon/simulator', icon: 'Play' },
{ name: 'Python SDK', href: '/vcon/sdk', icon: 'FileCode2' },
{ name: 'Simulator', href: '/vcon/simulator', icon: 'Play' },
],
},
];
@@ -83,36 +83,31 @@ export const Sidebar: React.FC<SidebarProps> = ({
{isOpen && (
<div
onClick={onClose}
className="fixed inset-x-0 top-14 bottom-0 z-40 bg-black/50 lg:hidden"
className="fixed inset-x-0 top-11 bottom-0 z-40 bg-black/50 lg:hidden"
/>
)}
{/* Sidebar Container */}
<aside
className={cn(
'fixed left-0 top-14 bottom-0 z-50 w-[264px] shrink-0 overflow-hidden bg-[var(--bg-sidebar)] border-r border-[var(--border)] flex flex-col transition-transform duration-150 ease-in-out lg:static lg:w-[264px] lg:translate-x-0',
'fixed left-0 top-11 bottom-0 z-50 w-[216px] shrink-0 overflow-hidden bg-[var(--bg-sidebar)] border-r border-[var(--border)] flex flex-col transition-transform duration-150 ease-in-out lg:static lg:w-[216px] lg:translate-x-0',
isOpen ? 'translate-x-0' : '-translate-x-full'
)}
>
{/* Top Header */}
<div className="h-[52px] px-4 flex items-center justify-between border-b border-[var(--border)] bg-[var(--bg-activity)] shrink-0">
<div className="flex items-center gap-2 min-w-0">
<span className="w-1.5 h-1.5 bg-[var(--accent)] shrink-0" />
<span className="text-[12px] font-semibold text-[var(--text)] uppercase truncate">
VCON ADMIN
</span>
</div>
{/* Mobile Close Header */}
<div className="h-9 px-3 flex items-center justify-between border-b border-[var(--border)] bg-[var(--bg-activity)] shrink-0 lg:hidden">
<span className="text-[11px] font-medium text-[var(--text-muted)]">Menu</span>
<button
onClick={onClose}
className="lg:hidden text-[var(--text-dim)] hover:text-[var(--text)] p-1 cursor-pointer"
className="text-[var(--text-dim)] hover:text-[var(--text)] p-1 cursor-pointer"
aria-label="Close menu"
>
<Icon name="X" size={13} />
<Icon name="X" size={12} />
</button>
</div>
{/* Navigation items */}
<nav aria-label="Admin navigation" className="flex-1 min-h-0 overflow-y-auto p-2.5 flex flex-col">
<nav aria-label="Admin navigation" className="flex-1 min-h-0 overflow-y-auto p-1.5 flex flex-col">
{navigation.map((section) => {
const isExpanded = openGroup === section.group;
const groupId = `nav-${section.group.toLowerCase().replaceAll(' ', '-')}`;
@@ -124,17 +119,17 @@ export const Sidebar: React.FC<SidebarProps> = ({
aria-expanded={isExpanded}
aria-controls={groupId}
onClick={() => setOpenGroup(isExpanded ? '' : section.group)}
className="w-full min-h-[42px] px-3 flex items-center justify-between gap-2 text-left text-[12px] font-medium text-[var(--text-muted)] hover:text-[var(--text)] transition-colors cursor-pointer"
className="w-full h-8 px-2.5 flex items-center justify-between gap-2 text-left text-[11px] font-medium text-[var(--text-muted)] hover:text-[var(--text)] transition-colors cursor-pointer"
>
<span className="truncate">{section.group}</span>
<Icon
name="ChevronDown"
size={12}
size={11}
className={cn('transition-transform', isExpanded && 'rotate-180')}
/>
</button>
{isExpanded && (
<div id={groupId} className="pb-1.5 flex flex-col gap-1">
<div id={groupId} className="pb-1 flex flex-col gap-0.5">
{section.items.map((item) => {
const isActive = pathname === item.href;
return (
@@ -143,25 +138,18 @@ export const Sidebar: React.FC<SidebarProps> = ({
href={item.href}
onClick={onClose}
className={cn(
'flex min-h-10 min-w-0 items-center justify-between gap-2 px-3 py-2 text-[13px] transition-colors border',
'flex h-8 min-w-0 items-center gap-2 px-2.5 text-[12px] transition-colors border',
isActive
? 'bg-[var(--accent-soft)] text-[var(--accent-hover)] font-medium border-[var(--accent)]'
: 'border-transparent text-[var(--text-muted)] hover:text-[var(--text)] hover:bg-[var(--bg-hover)]'
)}
>
<div className="flex items-center gap-2 min-w-0">
<Icon
name={item.icon}
size={16}
size={13}
className={isActive ? 'text-[var(--accent)]' : 'text-[var(--text-dim)]'}
/>
<span className="truncate">{item.name}</span>
</div>
{item.badge && (
<span className="text-[10px] px-1.5 py-0.5 bg-[var(--success-soft)] text-[var(--success)] font-mono border border-[var(--success)] shrink-0">
{item.badge}
</span>
)}
</Link>
);
})}
@@ -172,43 +160,26 @@ export const Sidebar: React.FC<SidebarProps> = ({
})}
</nav>
{/* Footer info */}
<div className="p-3 border-t border-[var(--border)] bg-[var(--bg-main)] text-[11px] text-[var(--text-dim)] font-mono flex flex-col gap-1.5 shrink-0">
<div className="flex items-center justify-between">
<span>Buffer Worker</span>
<span className="text-[var(--success)] flex items-center gap-1 font-semibold">
<span className="w-1.5 h-1.5 bg-[var(--success)] inline-block" />
Active
</span>
</div>
<div className="flex items-center justify-between">
<span>Storage Engine</span>
<span className="text-[var(--text-muted)]">json2csv</span>
</div>
<div className="flex items-center justify-between">
<span>Auth Handshake</span>
<span className="text-[var(--text-muted)]">JWT</span>
</div>
{/* Sign out action */}
{pathname !== '/vcon/setup' && (
<>
<div className="p-1.5 border-t border-[var(--border)] bg-[var(--bg-main)] shrink-0">
{signOutError && (
<p role="alert" className="text-[var(--danger)]">{signOutError}</p>
<p role="alert" className="px-2 pb-1 text-[11px] text-[var(--danger)]">{signOutError}</p>
)}
<Button
type="button"
variant="ghost"
size="sm"
size="xs"
icon="LogOut"
loading={isSigningOut}
disabled={isSigningOut}
onClick={signOut}
className="mt-1 w-full justify-start px-2 text-[11px]"
className="w-full justify-start px-2.5 text-[11.5px] h-7"
>
Sign out
</Button>
</>
)}
</div>
)}
</aside>
</>
);
+31 -48
View File
@@ -17,8 +17,8 @@ function safeNextPath() {
export function AdminLogin() {
const router = useRouter();
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
const [email, setEmail] = useState('admin@datastack.dev');
const [password, setPassword] = useState('admin12345678');
const [remember, setRemember] = useState(true);
const [showPassword, setShowPassword] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false);
@@ -63,7 +63,7 @@ export function AdminLogin() {
};
return (
<main className="relative grid min-h-dvh place-items-center bg-[var(--bg)] p-4 text-[var(--text)] sm:p-6">
<main className="relative grid min-h-dvh place-items-center bg-[var(--bg)] p-4 text-[var(--text)]">
<Button
type="button"
variant="icon"
@@ -71,29 +71,24 @@ export function AdminLogin() {
icon={theme === 'dark' ? 'Sun' : 'Moon'}
aria-label="Toggle theme"
title="Toggle theme"
className="fixed right-4 top-4 z-10 h-7 w-7 border border-[var(--border)] text-[var(--text-muted)]"
className="fixed right-3 top-3 z-10 h-7 w-7 border border-[var(--border)] text-[var(--text-muted)]"
onClick={toggleTheme}
/>
<section className="z-0 w-full max-w-xs border border-[var(--border)] bg-[var(--surface)]">
<header className="flex flex-col gap-3.5 border-b border-[var(--border)] px-5 pb-4 pt-5">
<Link href="/" className="flex items-center gap-2 text-[13px] font-medium text-[var(--text)]">
<span className="grid h-3.5 w-3.5 place-items-center bg-[var(--accent)]" aria-hidden="true">
<span className="h-1.5 w-1.5 bg-[var(--bg)]" />
<section className="z-0 w-full max-w-[300px] border border-[var(--border)] bg-[var(--surface)]">
<header className="flex items-center justify-between border-b border-[var(--border)] px-4 py-3">
<Link href="/" className="flex items-center gap-2 text-[12.5px] font-medium text-[var(--text)]">
<span className="grid h-3 w-3 place-items-center bg-[var(--accent)]" aria-hidden="true">
<span className="h-1 w-1 bg-[var(--bg)]" />
</span>
DataStack
<span className="ml-1 border border-[var(--border-strong)] px-1 py-px text-[9px] tracking-wider text-[var(--text-faint)]">CONSOLE</span>
</Link>
<div>
<h1 className="text-[15px] font-medium tracking-tight text-[var(--text)]">Sign in</h1>
<p className="mt-0.5 text-xs text-[var(--text-muted)]">Access your admin console</p>
</div>
<h1 className="text-[12px] font-medium text-[var(--text-muted)]">Sign in</h1>
</header>
<form onSubmit={submit} className="flex flex-col gap-3 px-5 py-4">
<form onSubmit={submit} className="flex flex-col gap-2.5 p-4">
{errorMessage && (
<div role="alert" className="flex items-start gap-2 border border-[var(--border-strong)] bg-[var(--surface-2)] px-2.5 py-2 text-xs leading-relaxed text-[var(--text-muted)]">
<span className="mt-1 h-1.5 w-1.5 shrink-0 bg-[var(--text-muted)]" aria-hidden="true" />
<span>{errorMessage}</span>
<div role="alert" className="border border-[var(--border-strong)] bg-[var(--surface-2)] px-2.5 py-1.5 text-[11px] text-[var(--text-muted)]">
{errorMessage}
</div>
)}
@@ -105,24 +100,20 @@ export function AdminLogin() {
value={email}
onChange={(event) => setEmail(event.target.value)}
compact
className="h-8 border-[var(--border)] bg-[var(--bg)] px-2.5 text-[12.5px] focus:border-[var(--border-strong)]"
required
/>
<div className="flex flex-col gap-1">
<label htmlFor="admin-password" className="text-[10px] uppercase tracking-wider text-[var(--text-faint)]">Password</label>
<div className="relative">
<Input
id="admin-password"
label="Password"
type={showPassword ? 'text' : 'password'}
autoComplete="current-password"
placeholder="Enter password"
placeholder="Password"
value={password}
onChange={(event) => setPassword(event.target.value)}
compact
className="h-8 border-[var(--border)] bg-[var(--bg)] px-2.5 pr-10 text-[12.5px] focus:border-[var(--border-strong)]"
required
/>
rightElement={
<Button
type="button"
variant="icon"
@@ -130,16 +121,13 @@ export function AdminLogin() {
icon={showPassword ? 'EyeOff' : 'Eye'}
aria-label={showPassword ? 'Hide password' : 'Show password'}
title={showPassword ? 'Hide password' : 'Show password'}
className="absolute right-0 top-0 h-8 w-8 border-l border-[var(--border)] text-[var(--text-faint)]"
className="h-7.5 w-7.5 border-l border-[var(--border-strong)] text-[var(--text-faint)]"
onClick={() => setShowPassword((current) => !current)}
/>
</div>
</div>
}
/>
<div className="flex items-center justify-between gap-2">
<FormSwitch label="Remember me" checked={remember} onChange={setRemember} />
<span className="shrink-0 text-[11px] text-[var(--text-faint)]">Server-managed access</span>
</div>
<Button
type="submit"
@@ -149,32 +137,27 @@ export function AdminLogin() {
iconPosition="right"
loading={isSubmitting}
disabled={isSubmitting}
className="mt-1 h-[34px] w-full justify-center text-[12.5px]"
className="mt-0.5 w-full justify-center"
>
Sign in
</Button>
<div className="my-0.5 flex items-center gap-2.5 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">
<span className="h-px flex-1 bg-[var(--border)]" />
Admin access
<span className="h-px flex-1 bg-[var(--border)]" />
</div>
<p className="text-center text-[11px] leading-relaxed text-[var(--text-faint)]">
Credentials are configured by the server operator.
</p>
<button
type="button"
onClick={() => {
setEmail('admin@datastack.dev');
setPassword('admin12345678');
}}
className="mt-0.5 text-center font-mono text-[10.5px] text-[var(--accent)] hover:underline cursor-pointer"
>
admin@datastack.dev / admin12345678
</button>
</form>
<footer className="flex items-center justify-between border-t border-[var(--border)] px-5 py-2.5 text-[10.5px] text-[var(--text-faint)]">
<span><span className="mr-1.5 inline-block h-1 w-1 bg-[var(--accent)] align-middle" />Protected session</span>
<footer className="flex items-center justify-end border-t border-[var(--border)] px-4 py-2 text-[10.5px]">
<Link href="/" className="text-[var(--text-muted)] hover:text-[var(--text)]">Home <ArrowRight className="inline h-3 w-3" aria-hidden="true" /></Link>
</footer>
</section>
<footer className="fixed bottom-3 left-0 right-0 flex items-center justify-center gap-2 text-[10.5px] text-[var(--text-faint)]">
<span>DataStack</span>
<span className="text-[var(--border-strong)]">·</span>
<span>Self-hosted</span>
</footer>
</main>
);
}
+18 -24
View File
@@ -2,7 +2,7 @@
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
import { ArrowRight, ShieldCheck } from 'lucide-react';
import { ArrowRight } from 'lucide-react';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { useState } from 'react';
@@ -15,13 +15,13 @@ export function AdminSetup({
initialEmail?: string;
}) {
const router = useRouter();
const [email, setEmail] = useState(initialEmail);
const [email, setEmail] = useState(initialEmail || 'admin@datastack.dev');
const [password, setPassword] = useState('');
const [confirmPassword, setConfirmPassword] = useState('');
const [setupKey, setSetupKey] = useState('');
const [isSubmitting, setIsSubmitting] = useState(false);
const [errorMessage, setErrorMessage] = useState(
databaseReady ? '' : 'The setup service is unavailable. Check the database connection and try again.',
databaseReady ? '' : 'Database connection unavailable.',
);
const submit = async (event: React.FormEvent<HTMLFormElement>) => {
@@ -29,11 +29,11 @@ export function AdminSetup({
setErrorMessage('');
if (password.length < 12) {
setErrorMessage('Choose a password with at least 12 characters.');
setErrorMessage('Password must be at least 12 characters.');
return;
}
if (password !== confirmPassword) {
setErrorMessage('The passwords do not match.');
setErrorMessage('Passwords do not match.');
return;
}
@@ -57,27 +57,21 @@ export function AdminSetup({
};
return (
<main className="relative grid min-h-dvh place-items-center bg-[var(--bg)] p-4 text-[var(--text)] sm:p-6">
<section className="w-full max-w-sm border border-[var(--border)] bg-[var(--surface)]">
<header className="flex flex-col gap-3.5 border-b border-[var(--border)] px-5 pb-4 pt-5">
<Link href="/" className="flex items-center gap-2 text-[13px] font-medium text-[var(--text)]">
<span className="grid h-3.5 w-3.5 place-items-center bg-[var(--accent)]" aria-hidden="true">
<span className="h-1.5 w-1.5 bg-[var(--bg)]" />
<main className="relative grid min-h-dvh place-items-center bg-[var(--bg)] p-4 text-[var(--text)]">
<section className="w-full max-w-[320px] border border-[var(--border)] bg-[var(--surface)]">
<header className="flex items-center justify-between border-b border-[var(--border)] px-4 py-3">
<Link href="/" className="flex items-center gap-2 text-[12.5px] font-medium text-[var(--text)]">
<span className="grid h-3 w-3 place-items-center bg-[var(--accent)]" aria-hidden="true">
<span className="h-1 w-1 bg-[var(--bg)]" />
</span>
DataStack
<span className="ml-1 border border-[var(--border-strong)] px-1 py-px text-[9px] tracking-wider text-[var(--text-faint)]">INITIAL SETUP</span>
</Link>
<div>
<h1 className="text-[15px] font-medium text-[var(--text)]">Create the first admin</h1>
<p className="mt-1 text-xs leading-relaxed text-[var(--text-muted)]">
This one-time setup creates the admin account stored in your database.
</p>
</div>
<h1 className="text-[12px] font-medium text-[var(--text-muted)]">Admin Setup</h1>
</header>
<form onSubmit={submit} className="flex flex-col gap-3 px-5 py-4">
<form onSubmit={submit} className="flex flex-col gap-2.5 p-4">
{errorMessage && (
<div role="alert" className="border border-[var(--border-strong)] bg-[var(--surface-2)] px-2.5 py-2 text-xs leading-relaxed text-[var(--text-muted)]">
<div role="alert" className="border border-[var(--border-strong)] bg-[var(--surface-2)] px-2.5 py-1.5 text-[11px] text-[var(--text-muted)]">
{errorMessage}
</div>
)}
@@ -116,6 +110,7 @@ export function AdminSetup({
label="Installation key"
type="password"
autoComplete="off"
placeholder="Installation key"
value={setupKey}
onChange={(event) => setSetupKey(event.target.value)}
compact
@@ -130,14 +125,13 @@ export function AdminSetup({
iconPosition="right"
loading={isSubmitting}
disabled={isSubmitting || !databaseReady}
className="mt-1 h-[34px] w-full justify-center text-[12.5px]"
className="mt-0.5 w-full justify-center"
>
Create admin account
Create admin
</Button>
</form>
<footer className="flex items-center justify-between border-t border-[var(--border)] px-5 py-2.5 text-[10.5px] text-[var(--text-faint)]">
<span className="inline-flex items-center gap-1.5"><ShieldCheck className="h-3 w-3" aria-hidden="true" />One-time installation</span>
<footer className="flex items-center justify-end border-t border-[var(--border)] px-4 py-2 text-[10.5px]">
<Link href="/vcon/login" className="inline-flex items-center gap-1 text-[var(--text-muted)] hover:text-[var(--text)]">
Sign in <ArrowRight className="h-3 w-3" aria-hidden="true" />
</Link>
-68
View File
@@ -1,68 +0,0 @@
import React from 'react';
import { Card } from '@/components/ui/Card';
import { Icon } from '@/components/ui/Icon';
export const Architecture: React.FC = () => {
return (
<div className="flex flex-col gap-1.5 py-1">
<div className="flex items-center justify-between border-b border-[var(--border)] pb-1">
<h2 className="text-[11px] font-semibold text-[var(--text)] uppercase tracking-wider">
Pipeline Flow
</h2>
<span className="text-[9px] text-[var(--text-dim)] font-mono">:4000 ➔ :3000</span>
</div>
<Card compact className="p-2.5 flex flex-col gap-2 font-mono text-[10px] bg-[var(--bg-elevated)]">
{/* Desktop Flow: 5 items */}
<div className="hidden md:grid md:grid-cols-5 gap-1.5 items-center text-center">
<div className="p-1.5 border border-[var(--border)] bg-[var(--bg-main)] flex flex-col items-center gap-0.5">
<Icon name="FileCode" size={12} className="text-[var(--accent)]" />
<span className="font-semibold text-[var(--text)]">Python SDK</span>
</div>
<div className="text-[var(--text-dim)] flex items-center justify-center gap-1">
<span className="text-[9px] px-1.5 py-0.2 border border-[var(--border)] bg-[var(--bg-main)] flex items-center gap-0.5">
<span>JWT</span>
<Icon name="ArrowRight" size={9} />
</span>
</div>
<div className="p-1.5 border border-[var(--border-strong)] bg-[var(--bg-main)] flex flex-col items-center gap-0.5">
<Icon name="Radio" size={12} className="text-[var(--accent)]" />
<span className="font-semibold text-[var(--text)]">Express Ingest (:4000)</span>
</div>
<div className="text-[var(--text-dim)] flex items-center justify-center gap-1">
<span className="text-[9px] px-1.5 py-0.2 border border-[var(--border)] bg-[var(--bg-main)] flex items-center gap-0.5">
<span>Buffer</span>
<Icon name="ArrowRight" size={9} />
</span>
</div>
<div className="p-1.5 border border-[var(--border)] bg-[var(--bg-main)] flex flex-col items-center gap-0.5">
<Icon name="HardDrive" size={12} className="text-[var(--success)]" />
<span className="font-semibold text-[var(--text)]">CSV Storage (Disk)</span>
</div>
</div>
{/* Mobile Flow: Vertical */}
<div className="flex md:hidden flex-col gap-1">
<div className="p-1.5 border border-[var(--border)] bg-[var(--bg-main)] flex items-center justify-between">
<span className="font-semibold text-[var(--text)]">1. Python SDK</span>
<span className="text-[8.5px] text-[var(--text-dim)]">Client</span>
</div>
<div className="p-1.5 border border-[var(--border-strong)] bg-[var(--bg-main)] flex items-center justify-between">
<span className="font-semibold text-[var(--text)]">2. Express (:4000)</span>
<span className="text-[8.5px] text-[var(--accent)]">Ingest</span>
</div>
<div className="p-1.5 border border-[var(--border)] bg-[var(--bg-main)] flex items-center justify-between">
<span className="font-semibold text-[var(--text)]">3. CSV Files</span>
<span className="text-[8.5px] text-[var(--success)]">Rotated</span>
</div>
</div>
</Card>
</div>
);
};
export default Architecture;
+9 -8
View File
@@ -1,7 +1,7 @@
'use client';
import { Input } from '@/components/ui/Input';
import { Pill } from '@/components/ui/Pill';
import { Search } from 'lucide-react';
import type { ClientStatusFilter } from './clients/types';
interface ClientsFiltersProps {
@@ -27,16 +27,17 @@ export function ClientsFilters({
counts,
}: ClientsFiltersProps) {
return (
<div className="mb-3 flex flex-wrap items-center gap-2">
<div className="flex h-8 w-full flex-1 items-center gap-1.5 border border-[var(--border)] bg-[var(--surface)] px-2.5 sm:max-w-xs">
<Search className="h-3.5 w-3.5 shrink-0 text-[var(--text-faint)]" aria-hidden="true" />
<input
<div className="mb-2.5 flex flex-wrap items-center gap-2">
<div className="w-full flex-1 sm:max-w-xs">
<Input
compact
icon="Search"
type="search"
aria-label="Search clients"
value={search}
onChange={(event) => onSearchChange(event.target.value)}
placeholder="Search by name or client ID"
className="min-w-0 flex-1 bg-transparent text-xs text-[var(--text)] outline-none placeholder:text-[var(--text-faint)]"
placeholder="Search client..."
className="bg-[var(--surface)]"
/>
</div>
<div className="ml-auto flex min-w-0 gap-1 overflow-x-auto" role="group" aria-label="Filter clients by status">
@@ -47,7 +48,7 @@ export function ClientsFilters({
onClick={() => onStatusChange(filter.key)}
>
{filter.label}
<span className="text-[10px] text-[var(--text-faint)]">
<span className="font-mono text-[9.5px] tabular-nums text-[var(--text-faint)]">
{counts[filter.key].toLocaleString()}
</span>
</Pill>
-475
View File
@@ -1,475 +0,0 @@
'use client';
import { Button } from '@/components/ui/Button';
import { Card } from '@/components/ui/Card';
import { Input, Textarea } from '@/components/ui/Input';
import { Modal } from '@/components/ui/Modal';
import {
Table,
TableBody,
TableCell,
TableEmpty,
TableHead,
TableHeader,
TableRow,
TableWrap,
} from '@/components/ui/Table';
import { useToast } from '@/components/ui/Toast';
import { useCallback, useEffect, useMemo, useState } from 'react';
interface Client {
clientId: string;
name: string;
rateLimit: number;
status: 'active' | 'revoked';
totalEvents: number;
lastActive?: string;
createdAt: string;
}
interface ClientCredentials extends Client {
secret: string;
token: string;
}
type ClientFilter = 'all' | 'online' | 'offline' | 'pending';
function isOnline(client: Client) {
return Boolean(
client.status === 'active' &&
client.lastActive &&
Date.now() - new Date(client.lastActive).getTime() < 60_000
);
}
function isPending(client: Client) {
return client.status === 'active' && !client.lastActive;
}
function relativeTime(timestamp?: string) {
if (!timestamp) return 'Never';
const elapsedSeconds = Math.max(0, Math.floor((Date.now() - new Date(timestamp).getTime()) / 1000));
if (elapsedSeconds < 10) return 'Just now';
if (elapsedSeconds < 60) return `${elapsedSeconds}s ago`;
if (elapsedSeconds < 3600) return `${Math.floor(elapsedSeconds / 60)}m ago`;
if (elapsedSeconds < 86_400) return `${Math.floor(elapsedSeconds / 3600)}h ago`;
return `${Math.floor(elapsedSeconds / 86_400)}d ago`;
}
export function ClientsManager() {
const { success, error, warning } = useToast();
const [clients, setClients] = useState<Client[]>([]);
const [loading, setLoading] = useState(true);
const [loadError, setLoadError] = useState('');
const [search, setSearch] = useState('');
const [filter, setFilter] = useState<ClientFilter>('all');
const [createModalOpen, setCreateModalOpen] = useState(false);
const [credentialsModalOpen, setCredentialsModalOpen] = useState(false);
const [selectedClient, setSelectedClient] = useState<ClientCredentials | null>(null);
const [newClientId, setNewClientId] = useState('');
const [newClientName, setNewClientName] = useState('');
const [newRateLimit, setNewRateLimit] = useState('100');
const [submitting, setSubmitting] = useState(false);
const fetchClients = useCallback(async () => {
try {
const response = await fetch('/api/clients');
if (!response.ok) throw new Error('Unable to load clients');
const data = await response.json();
setClients(data.clients || []);
setLoadError('');
} catch (fetchError) {
setLoadError(fetchError instanceof Error ? fetchError.message : 'Unable to load clients');
} finally {
setLoading(false);
}
}, []);
useEffect(() => {
fetchClients();
}, [fetchClients]);
const onlineCount = clients.filter(isOnline).length;
const pendingCount = clients.filter(isPending).length;
const offlineCount = clients.length - onlineCount - pendingCount;
const eventCount = clients.reduce((sum, client) => sum + client.totalEvents, 0);
const visibleClients = useMemo(() => {
const query = search.trim().toLowerCase();
return clients.filter((client) => {
const matchesSearch =
!query ||
client.clientId.toLowerCase().includes(query) ||
client.name.toLowerCase().includes(query);
const matchesFilter =
filter === 'all' ||
(filter === 'online' && isOnline(client)) ||
(filter === 'offline' && !isOnline(client) && !isPending(client)) ||
(filter === 'pending' && isPending(client));
return matchesSearch && matchesFilter;
});
}, [clients, filter, search]);
const handleCreateClient = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
if (!newClientId.trim() || !newClientName.trim()) {
error('Validation error', 'Client ID and client name are required.');
return;
}
setSubmitting(true);
try {
const response = await fetch('/api/clients', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
clientId: newClientId.trim(),
name: newClientName.trim(),
rateLimit: Number(newRateLimit) || 100,
}),
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Client registration failed');
setSelectedClient(data.client);
setCreateModalOpen(false);
setCredentialsModalOpen(true);
setNewClientId('');
setNewClientName('');
setNewRateLimit('100');
success('Client registered', `${data.client.clientId} is ready to connect.`);
await fetchClients();
} catch (submitError) {
error('Registration failed', submitError instanceof Error ? submitError.message : 'Unknown error');
} finally {
setSubmitting(false);
}
};
const handleToggleStatus = async (client: Client) => {
const status = client.status === 'active' ? 'revoked' : 'active';
if (status === 'revoked' && !window.confirm(`Revoke access for ${client.clientId}?`)) return;
try {
const response = await fetch(`/api/clients/${encodeURIComponent(client.clientId)}`, {
method: 'PATCH',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ status }),
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Unable to update client status');
warning('Client status updated', `${client.clientId} is now ${status}.`);
await fetchClients();
} catch (updateError) {
error('Status update failed', updateError instanceof Error ? updateError.message : 'Unknown error');
}
};
const handleRotateKey = async (client: Client) => {
if (!window.confirm(`Rotate credentials for ${client.clientId}? Existing credentials will stop working.`)) return;
try {
const response = await fetch(`/api/clients/${encodeURIComponent(client.clientId)}`, {
method: 'PATCH',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ action: 'regenerate_token' }),
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Unable to rotate client credentials');
setSelectedClient(data.client);
setCredentialsModalOpen(true);
success('Credentials rotated', `New credentials issued for ${client.clientId}.`);
await fetchClients();
} catch (rotateError) {
error('Credential rotation failed', rotateError instanceof Error ? rotateError.message : 'Unknown error');
}
};
const copyToClipboard = async (value: string, label: string) => {
try {
await navigator.clipboard.writeText(value);
success('Copied', `${label} copied to clipboard.`);
} catch {
error('Copy failed', 'Clipboard access is unavailable in this browser.');
}
};
const filters: { id: ClientFilter; label: string; count: number }[] = [
{ id: 'all', label: 'All', count: clients.length },
{ id: 'online', label: 'Online', count: onlineCount },
{ id: 'offline', label: 'Offline', count: offlineCount },
{ id: 'pending', label: 'Pending', count: pendingCount },
];
return (
<section className="mx-auto flex w-full max-w-[var(--container-width)] flex-col gap-4">
<nav aria-label="Breadcrumb" className="flex items-center gap-1.5 text-xs text-[var(--text-faint)]">
<span>Console</span>
<span aria-hidden="true" className="text-[var(--border-strong)]">/</span>
<span aria-current="page" className="text-[var(--text)]">Clients</span>
</nav>
<header className="flex flex-wrap items-center justify-between gap-3">
<div>
<h1 className="text-base font-medium tracking-tight text-[var(--text)]">Clients</h1>
<p className="mt-0.5 text-xs text-[var(--text-muted)]">Registered SDK clients and their API access</p>
</div>
<Button type="button" variant="primary" size="sm" icon="Plus" onClick={() => setCreateModalOpen(true)}>
New client
</Button>
</header>
<Card compact className="!p-0">
<div className="grid grid-cols-2 gap-px bg-[var(--border)] lg:grid-cols-4">
<StatCell label="Total clients" value={clients.length.toLocaleString()} />
<StatCell label="Online now" value={onlineCount.toLocaleString()} status="online" />
<StatCell label="Offline" value={offlineCount.toLocaleString()} status="offline" />
<StatCell label="Pending setup" value={pendingCount.toLocaleString()} status="pending" />
</div>
</Card>
<div className="flex flex-col gap-3 sm:flex-row sm:items-center">
<Input
compact
aria-label="Search clients"
placeholder="Search by name or client ID"
icon="Search"
value={search}
onChange={(event) => setSearch(event.target.value)}
className="bg-[var(--surface)] sm:max-w-xs"
/>
<div className="flex min-w-0 gap-1 overflow-x-auto sm:ml-auto" role="group" aria-label="Filter clients by status">
{filters.map((item) => (
<Button
key={item.id}
type="button"
size="xs"
variant="secondary"
aria-pressed={filter === item.id}
className={filter === item.id ? 'border-[var(--border-strong)] bg-[var(--surface-2)] text-[var(--text)]' : 'text-[var(--text-muted)]'}
onClick={() => setFilter(item.id)}
>
{item.label}<span className="text-[var(--text-faint)]">{item.count}</span>
</Button>
))}
</div>
</div>
<TableWrap>
<Table className="min-w-[760px] text-xs">
<TableHeader>
<TableRow>
<TableHead>Client</TableHead>
<TableHead>API key</TableHead>
<TableHead>Status</TableHead>
<TableHead className="text-right">Events</TableHead>
<TableHead>Last seen</TableHead>
<TableHead className="text-right">Actions</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{loading ? (
<TableEmpty colSpan={6} message="Loading clients..." />
) : loadError ? (
<TableEmpty colSpan={6} message={loadError} />
) : visibleClients.length === 0 ? (
<TableEmpty colSpan={6} message={search || filter !== 'all' ? 'No clients match these filters.' : 'No registered SDK clients yet.'} />
) : (
visibleClients.map((client) => (
<TableRow key={client.clientId}>
<TableCell>
<div className="flex min-w-0 items-center gap-2.5">
<span className={`h-1.5 w-1.5 shrink-0 ${client.status === 'active' ? 'bg-[var(--accent)]' : 'bg-[var(--text-faint)]'}`} />
<div className="min-w-0">
<div className="truncate text-[var(--text)]">{client.name}</div>
<div className="truncate font-mono text-[11px] text-[var(--text-faint)]">{client.clientId}</div>
</div>
</div>
</TableCell>
<TableCell className="font-mono text-[var(--text-muted)]" title="Secret keys are hidden. Rotate credentials to issue a new key.">
sec_••••••••
</TableCell>
<TableCell>
<span className="inline-flex items-center gap-1.5 text-[var(--text-muted)]">
<span className={`h-1.5 w-1.5 ${client.status === 'active' ? 'bg-[var(--accent)]' : 'bg-[var(--text-faint)]'}`} />
{client.status}
</span>
</TableCell>
<TableCell className="text-right font-mono text-[var(--text)]">
{client.totalEvents.toLocaleString()}
</TableCell>
<TableCell className="font-mono text-[11px] text-[var(--text-muted)]">
{relativeTime(client.lastActive)}
</TableCell>
<TableCell className="text-right">
<div className="inline-flex items-center gap-1">
<Button
type="button"
variant="icon"
size="icon"
icon="Activity"
className="h-7 w-7 border border-[var(--border)]"
title={`View events for ${client.clientId}`}
aria-label={`View events for ${client.clientId}`}
onClick={() => window.location.assign(`/vcon/data?clientId=${encodeURIComponent(client.clientId)}`)}
/>
<Button
type="button"
variant="icon"
size="icon"
icon="RotateCw"
className="h-7 w-7 border border-[var(--border)]"
title={`Rotate key for ${client.clientId}`}
aria-label={`Rotate key for ${client.clientId}`}
onClick={() => handleRotateKey(client)}
/>
<Button
type="button"
variant="icon"
size="icon"
icon={client.status === 'active' ? 'ShieldOff' : 'ShieldCheck'}
className="h-7 w-7 border border-[var(--border)]"
title={`${client.status === 'active' ? 'Revoke' : 'Reactivate'} ${client.clientId}`}
aria-label={`${client.status === 'active' ? 'Revoke' : 'Reactivate'} ${client.clientId}`}
onClick={() => handleToggleStatus(client)}
/>
</div>
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</TableWrap>
<Modal
isOpen={createModalOpen}
onClose={() => setCreateModalOpen(false)}
title="Create client"
footer={
<>
<Button type="button" variant="ghost" size="sm" onClick={() => setCreateModalOpen(false)}>
Cancel
</Button>
<Button type="submit" form="create-client-form" variant="primary" size="sm" loading={submitting}>
Create client
</Button>
</>
}
>
<form id="create-client-form" onSubmit={handleCreateClient} className="flex flex-col gap-3">
<Input
label="Client ID"
placeholder="e.g. py_order_service_04"
value={newClientId}
onChange={(event) => setNewClientId(event.target.value)}
required
/>
<Input
label="Client name"
placeholder="e.g. Order Service"
value={newClientName}
onChange={(event) => setNewClientName(event.target.value)}
required
/>
<Input
label="Rate limit (requests per second)"
type="number"
min="1"
max="5000"
value={newRateLimit}
onChange={(event) => setNewRateLimit(event.target.value)}
/>
</form>
</Modal>
<Modal
isOpen={credentialsModalOpen}
onClose={() => setCredentialsModalOpen(false)}
title={`Credentials: ${selectedClient?.clientId || ''}`}
description="Copy these credentials now. The secret key is only shown after creation or rotation."
footer={
<Button type="button" variant="secondary" size="sm" onClick={() => setCredentialsModalOpen(false)}>
Close
</Button>
}
>
{selectedClient && (
<div className="flex flex-col gap-3">
<CredentialField
label="Client ID"
value={selectedClient.clientId}
onCopy={() => copyToClipboard(selectedClient.clientId, 'Client ID')}
/>
<CredentialField
label="Client secret key"
value={selectedClient.secret}
onCopy={() => copyToClipboard(selectedClient.secret, 'Client secret key')}
/>
<div className="flex flex-col gap-1.5">
<div className="flex items-center justify-between gap-2">
<label htmlFor="client-token" className="text-xs uppercase text-[var(--text-faint)]">
JWT handshake bearer token
</label>
<Button
type="button"
variant="ghost"
size="xs"
icon="Copy"
onClick={() => copyToClipboard(selectedClient.token, 'JWT token')}
>
Copy
</Button>
</div>
<Textarea id="client-token" readOnly value={selectedClient.token} rows={4} className="font-mono text-xs text-[var(--accent)]" />
</div>
</div>
)}
</Modal>
</section>
);
}
function StatCell({
label,
value,
status,
}: {
label: string;
value: string;
status?: 'online' | 'offline' | 'pending';
}) {
return (
<div className="bg-[var(--surface)] px-4 py-3">
<div className="mb-1 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">{label}</div>
<div className="flex items-center gap-2 text-lg font-medium leading-none tracking-tight text-[var(--text)]">
{status && (
<span className={`h-1.5 w-1.5 ${status === 'online' ? 'bg-[var(--accent)]' : 'bg-[var(--text-faint)]'}`} />
)}
{value}
</div>
</div>
);
}
function CredentialField({
label,
value,
onCopy,
}: {
label: string;
value: string;
onCopy: () => void;
}) {
return (
<div className="flex flex-col gap-1.5">
<label className="text-xs uppercase text-[var(--text-faint)]">{label}</label>
<div className="flex min-w-0 items-center justify-between gap-2 border border-[var(--border)] bg-[var(--bg)] p-2.5">
<code className="min-w-0 truncate font-mono text-xs text-[var(--text)]">{value}</code>
<Button type="button" variant="icon" size="icon" icon="Copy" className="h-7 w-7" title={`Copy ${label}`} aria-label={`Copy ${label}`} onClick={onCopy} />
</div>
</div>
);
}
+109 -35
View File
@@ -2,6 +2,7 @@
import { Button } from '@/components/ui/Button';
import { CopyButton } from '@/components/ui/CopyButton';
import { Textarea } from '@/components/ui/Input';
import { Modal } from '@/components/ui/Modal';
import {
Table,
@@ -36,9 +37,14 @@ function relativeTime(timestamp: string | undefined, now: number) {
export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps) {
const { success, error } = useToast();
const [credentials, setCredentials] = useState<ClientCredentials | null>(null);
const [confirmAction, setConfirmAction] = useState<{
type: 'rotate' | 'revoke';
client: ClientItem;
} | null>(null);
const [processing, setProcessing] = useState(false);
const rotateKey = async (client: ClientItem) => {
if (!window.confirm(`Rotate credentials for ${client.clientId}? Existing credentials will stop working.`)) return;
const executeRotateKey = async (client: ClientItem) => {
setProcessing(true);
try {
const response = await fetch(`/api/clients/${encodeURIComponent(client.clientId)}`, {
method: 'PATCH',
@@ -47,17 +53,19 @@ export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Unable to rotate credentials');
setConfirmAction(null);
setCredentials(data.client);
success('Credentials rotated', `New credentials issued for ${client.clientId}.`);
await onStatusChange();
} catch (rotateError) {
error('Credential rotation failed', rotateError instanceof Error ? rotateError.message : 'Unknown error');
} finally {
setProcessing(false);
}
};
const toggleStatus = async (client: ClientItem) => {
const status = client.status === 'active' ? 'revoked' : 'active';
if (status === 'revoked' && !window.confirm(`Revoke access for ${client.clientId}?`)) return;
const executeStatusChange = async (client: ClientItem, status: 'active' | 'revoked') => {
setProcessing(true);
try {
const response = await fetch(`/api/clients/${encodeURIComponent(client.clientId)}`, {
method: 'PATCH',
@@ -66,17 +74,37 @@ export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Unable to update client status');
setConfirmAction(null);
success('Client status updated', `${client.clientId} is now ${status}.`);
await onStatusChange();
} catch (statusError) {
error('Status update failed', statusError instanceof Error ? statusError.message : 'Unknown error');
} finally {
setProcessing(false);
}
};
const toggleStatus = (client: ClientItem) => {
if (client.status === 'active') {
setConfirmAction({ type: 'revoke', client });
} else {
void executeStatusChange(client, 'active');
}
};
const handleConfirm = async () => {
if (!confirmAction) return;
if (confirmAction.type === 'rotate') {
await executeRotateKey(confirmAction.client);
} else {
await executeStatusChange(confirmAction.client, 'revoked');
}
};
return (
<>
<TableWrap>
<Table className="min-w-[760px] text-xs">
<Table className="min-w-[680px] text-[11px]">
<TableHeader>
<TableRow>
<TableHead>Client</TableHead>
@@ -88,7 +116,7 @@ export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps
</TableHeader>
<TableBody>
{clients.length === 0 ? (
<TableEmpty colSpan={5} message="No clients match these filters." />
<TableEmpty colSpan={5} message="No matching clients" />
) : (
clients.map((client) => {
const online = client.status === 'active' && Boolean(client.lastActive) &&
@@ -102,34 +130,34 @@ export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps
: 'bg-[var(--text-faint)]';
return (
<TableRow key={client.clientId} className="border-b border-[var(--border)] last:border-b-0 hover:bg-[var(--surface-2)]">
<TableCell className="px-3.5 py-2.5">
<div className="flex min-w-0 items-center gap-2.5">
<TableRow key={client.clientId}>
<TableCell>
<div className="flex min-w-0 items-center gap-2">
<span className={`h-1.5 w-1.5 shrink-0 ${dotClass}`} title={label} />
<div className="min-w-0 leading-tight">
<div className="truncate text-[12.5px] text-[var(--text)]">{client.name}</div>
<div className="mt-0.5 truncate font-mono text-[10.5px] text-[var(--text-faint)]">{client.clientId}</div>
<div className="truncate text-[11.5px] text-[var(--text)]">{client.name}</div>
<div className="mt-0.5 truncate font-mono text-[10px] text-[var(--text-faint)]">{client.clientId}</div>
</div>
</div>
</TableCell>
<TableCell className="px-3.5 py-2.5 font-mono text-[11.5px] text-[var(--text-muted)]" title="Secret keys are hidden. Rotate credentials to issue a new key.">
<TableCell className="font-mono text-[11px]">
sec_••••••••
</TableCell>
<TableCell className="px-3.5 py-2.5 text-right font-mono text-[11.5px] text-[var(--text-muted)]">
<TableCell className="text-right font-mono text-[11px] tabular-nums">
{client.totalEvents.toLocaleString()}
</TableCell>
<TableCell className="px-3.5 py-2.5 font-mono text-[11.5px] text-[var(--text-muted)]">
<TableCell className="font-mono text-[11px] tabular-nums">
{client.lastActive ? new Date(client.lastActive).toLocaleTimeString([], { hour12: false }) : '—'}
<span className="ml-1 font-sans text-[10.5px] text-[var(--text-faint)]">{relativeTime(client.lastActive, now)}</span>
<span className="ml-1 font-sans text-[10px] text-[var(--text-faint)]">{relativeTime(client.lastActive, now)}</span>
</TableCell>
<TableCell className="px-3.5 py-2.5 text-right">
<TableCell className="text-right">
<div className="inline-flex gap-0.5">
<Button
type="button"
variant="icon"
size="icon"
icon="Activity"
className="h-[26px] w-[26px] border border-transparent hover:border-[var(--border)] hover:bg-[var(--surface-2)]"
className="h-6 w-6 border border-transparent hover:border-[var(--border)] hover:bg-[var(--surface-2)]"
title={`View events for ${client.clientId}`}
aria-label={`View events for ${client.clientId}`}
onClick={() => window.location.assign(`/vcon/data?clientId=${encodeURIComponent(client.clientId)}`)}
@@ -139,17 +167,17 @@ export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps
variant="icon"
size="icon"
icon="RefreshCw"
className="h-[26px] w-[26px] border border-transparent hover:border-[var(--border)] hover:bg-[var(--surface-2)]"
className="h-6 w-6 border border-transparent hover:border-[var(--border)] hover:bg-[var(--surface-2)]"
title={`Rotate key for ${client.clientId}`}
aria-label={`Rotate key for ${client.clientId}`}
onClick={() => rotateKey(client)}
onClick={() => setConfirmAction({ type: 'rotate', client })}
/>
<Button
type="button"
variant="icon"
size="icon"
icon={client.status === 'active' ? 'Trash2' : 'ShieldCheck'}
className={`h-[26px] w-[26px] border border-transparent ${client.status === 'active' ? 'hover:border-[var(--danger)] hover:text-[var(--danger)]' : 'hover:border-[var(--border)] hover:bg-[var(--surface-2)]'}`}
className={`h-6 w-6 border border-transparent ${client.status === 'active' ? 'hover:border-[var(--danger)] hover:text-[var(--danger)]' : 'hover:border-[var(--border)] hover:bg-[var(--surface-2)]'}`}
title={`${client.status === 'active' ? 'Revoke' : 'Reactivate'} ${client.clientId}`}
aria-label={`${client.status === 'active' ? 'Revoke' : 'Reactivate'} ${client.clientId}`}
onClick={() => toggleStatus(client)}
@@ -164,31 +192,77 @@ export function ClientsTable({ clients, now, onStatusChange }: ClientsTableProps
</Table>
</TableWrap>
<Modal
isOpen={Boolean(confirmAction)}
onClose={() => !processing && setConfirmAction(null)}
title={confirmAction?.type === 'rotate' ? 'Rotate credentials' : 'Revoke access'}
maxWidth="xs"
footer={
<>
<Button type="button" variant="ghost" size="xs" disabled={processing} onClick={() => setConfirmAction(null)}>
Cancel
</Button>
<Button
type="button"
variant={confirmAction?.type === 'revoke' ? 'danger' : 'primary'}
size="xs"
loading={processing}
onClick={handleConfirm}
>
{confirmAction?.type === 'rotate' ? 'Rotate' : 'Revoke'}
</Button>
</>
}
>
<p className="text-[12px] text-[var(--text-muted)]">
{confirmAction?.type === 'rotate'
? `Rotate credentials for ${confirmAction.client.clientId}? Existing credentials will stop working.`
: `Revoke access for ${confirmAction?.client.clientId || ''}?`}
</p>
</Modal>
<Modal
isOpen={Boolean(credentials)}
onClose={() => setCredentials(null)}
title={`Credentials: ${credentials?.clientId || ''}`}
description="Copy the new credentials now. The secret is only shown after rotation."
footer={<Button type="button" size="sm" onClick={() => setCredentials(null)}>Close</Button>}
footer={<Button type="button" size="xs" onClick={() => setCredentials(null)}>Close</Button>}
>
{credentials && (
<div className="flex flex-col gap-3">
<Credential label="Client ID" value={credentials.clientId} />
<Credential label="Client secret key" value={credentials.secret} />
<Credential label="JWT token" value={credentials.token} />
</div>
)}
{credentials && <CredentialsDisplay credentials={credentials} />}
</Modal>
</>
);
}
function Credential({ label, value }: { label: string; value: string }) {
export function CredentialsDisplay({ credentials }: { credentials: ClientCredentials }) {
return (
<div className="flex flex-col gap-1.5">
<span className="text-xs uppercase text-[var(--text-faint)]">{label}</span>
<div className="flex min-w-0 items-center justify-between gap-2 border border-[var(--border)] bg-[var(--bg)] p-2.5">
<code className="min-w-0 break-all font-mono text-xs text-[var(--text)]">{value}</code>
<div className="flex flex-col gap-2.5">
<CredentialItem label="Client ID" value={credentials.clientId} />
<CredentialItem label="Secret key" value={credentials.secret} />
<div className="flex flex-col gap-1">
<div className="flex items-center justify-between gap-2">
<label htmlFor={`token-${credentials.clientId}`} className="text-[10px] uppercase tracking-wider text-[var(--text-faint)]">
JWT token
</label>
<CopyButton value={credentials.token} />
</div>
<Textarea
id={`token-${credentials.clientId}`}
readOnly
value={credentials.token}
rows={3}
className="font-mono text-[11px] text-[var(--accent)]"
/>
</div>
</div>
);
}
function CredentialItem({ label, value }: { label: string; value: string }) {
return (
<div className="flex flex-col gap-1">
<span className="text-[10px] uppercase tracking-wider text-[var(--text-faint)]">{label}</span>
<div className="flex min-w-0 items-center justify-between gap-2 border border-[var(--border)] bg-[var(--bg)] p-2">
<code className="min-w-0 truncate font-mono text-[11px] text-[var(--text)]">{value}</code>
<CopyButton value={value} />
</div>
</div>
+27 -40
View File
@@ -1,5 +1,6 @@
'use client';
import { AdminPageHeader } from '@/components/layout/AdminPageHeader';
import { Button } from '@/components/ui/Button';
import { ClientList, type ClientListItem } from '@/components/ui/ClientList';
import { Panel } from '@/components/ui/Panel';
@@ -106,22 +107,11 @@ export const DashboardOverview: React.FC = () => {
const totalRows = metrics?.storageStats.totalRows ?? files.reduce((sum, file) => sum + file.linesCount, 0);
return (
<section className="flex w-full max-w-[var(--console-width)] flex-col gap-4">
<header className="flex flex-wrap items-center justify-between gap-4">
<div>
<nav aria-label="Breadcrumb" className="mb-1 flex items-center gap-2 text-[11px] text-[var(--text-faint)]">
<span>Console</span>
<span>/</span>
<span className="text-[var(--text)]">Dashboard</span>
</nav>
<h1 className="text-[17px] font-medium text-[var(--text)]">Dashboard</h1>
<p className="mt-0.5 text-[12px] text-[var(--text-muted)]">Last 24 hours · UTC</p>
</div>
<div className="flex flex-wrap items-center gap-2">
<span className="mr-2 inline-flex items-center gap-2 text-[10px] uppercase text-[var(--text-muted)]">
<span className="h-1.5 w-1.5 bg-[var(--accent)]" />
{metrics ? `${metrics.bufferStats.currentBufferSize} buffered` : 'Connecting'}
</span>
<section className="w-full">
<AdminPageHeader
title="Dashboard"
actions={
<>
<Button
size="icon"
variant="secondary"
@@ -132,46 +122,43 @@ export const DashboardOverview: React.FC = () => {
onClick={() => void refresh()}
/>
<a href="/api/export?clientId=all" download>
<Button size="sm" variant="secondary" icon="Download">Quick export</Button>
<Button size="xs" variant="secondary" icon="Download">Export</Button>
</a>
<Link href="/vcon/clients">
<Button size="sm" variant="primary" icon="Plus">New client</Button>
<Button size="xs" variant="primary" icon="Plus">New client</Button>
</Link>
</div>
</header>
</>
}
/>
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-4">
<div className="mb-2.5 grid grid-cols-2 gap-2.5 xl:grid-cols-4">
<StatCard
label="Events today"
value={eventsToday.toLocaleString()}
meta={`${metrics?.bufferStats.currentBufferSize ?? 0} waiting in buffer`}
/>
<StatCard
label="Active clients"
value={`${activeClients} / ${totalClients}`}
meta="registered clients"
/>
<StatCard
label="Storage used"
value={storageValue}
unit={storageUnit}
meta="across stored CSV files"
/>
<StatCard
label="Stored rows"
value={totalRows.toLocaleString()}
meta={`${totalFiles} CSV files`}
/>
</div>
<div className="grid min-w-0 grid-cols-1 gap-3 xl:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]">
<div className="grid min-w-0 grid-cols-1 gap-2.5 xl:grid-cols-[minmax(0,2fr)_minmax(0,1fr)]">
<Panel
title="Live ingestion"
meta={`${events.length} recent events`}
title="Recent events"
meta={`${events.length}`}
action={<Link href="/vcon/data" className="text-[11px] text-[var(--text-muted)] hover:text-[var(--text)]">View all →</Link>}
>
<TableWrap className="border-0 bg-transparent">
<Table className="min-w-[600px] text-[11.5px]">
<Table className="min-w-[560px] text-[11px]">
<TableHeader>
<TableRow>
<TableHead>Time</TableHead>
@@ -183,16 +170,16 @@ export const DashboardOverview: React.FC = () => {
<TableBody>
{events.map((event) => (
<TableRow key={event.eventId}>
<TableCell className="font-mono text-[11px] text-[var(--text-faint)]">
<TableCell className="font-mono text-[10.5px] tabular-nums text-[var(--text-faint)]">
{event.timestamp.includes('T') ? new Date(event.timestamp).toLocaleTimeString() : event.timestamp}
</TableCell>
<TableCell className="font-mono text-[11px] text-[var(--accent)]">
{event.clientId}
</TableCell>
<TableCell className="max-w-[420px] truncate font-mono text-[11px] text-[var(--text)]">
<TableCell className="max-w-[380px] truncate font-mono text-[11px] text-[var(--text)]">
{event.payload}
</TableCell>
<TableCell className="text-right font-mono text-[11px] text-[var(--text-faint)]">
<TableCell className="text-right font-mono text-[10.5px] tabular-nums text-[var(--text-faint)]">
{new TextEncoder().encode(event.payload).length} B
</TableCell>
</TableRow>
@@ -202,9 +189,9 @@ export const DashboardOverview: React.FC = () => {
</TableWrap>
</Panel>
<div className="flex min-w-0 flex-col gap-3">
<div className="flex min-w-0 flex-col gap-2.5">
<Panel
title="Recent clients"
title="Clients"
action={<Link href="/vcon/clients" className="text-[11px] text-[var(--text-muted)] hover:text-[var(--text)]">All →</Link>}
>
<ClientList clients={clients} limit={4} />
@@ -212,23 +199,23 @@ export const DashboardOverview: React.FC = () => {
<Panel
title="Storage"
meta={`${totalFiles} files`}
action={<a href="/api/export?clientId=all" download className="text-[11px] text-[var(--text-muted)] hover:text-[var(--text)]">Quick export ↓</a>}
meta={`${totalFiles}`}
action={<a href="/api/export?clientId=all" download className="text-[11px] text-[var(--text-muted)] hover:text-[var(--text)]">Export ↓</a>}
>
<div className="divide-y divide-[var(--border)]">
{files.slice(0, 3).map((file) => (
<div key={`${file.clientId}/${file.filename}`} className="flex items-center justify-between gap-3 px-4 py-2">
<div key={`${file.clientId}/${file.filename}`} className="flex items-center justify-between gap-2.5 px-3 py-1.5">
<div className="min-w-0">
<p className="truncate text-[12px] text-[var(--text)]">{file.filename}</p>
<p className="truncate text-[11.5px] text-[var(--text)]">{file.filename}</p>
<p className="truncate font-mono text-[10px] text-[var(--text-faint)]">{file.clientId}</p>
</div>
<span className="shrink-0 font-mono text-[11px] text-[var(--text-muted)]">
<span className="shrink-0 font-mono text-[10.5px] tabular-nums text-[var(--text-muted)]">
{(file.sizeBytes / 1024).toFixed(1)} KB
</span>
</div>
))}
{files.length === 0 && (
<p className="px-4 py-5 text-[12px] text-[var(--text-faint)]">No CSV files yet.</p>
<p className="px-3 py-4 text-[11px] text-[var(--text-faint)]">No CSV files</p>
)}
</div>
</Panel>
+58 -71
View File
@@ -1,9 +1,11 @@
'use client';
import { AdminPageHeader } from '@/components/layout/AdminPageHeader';
import { Button } from '@/components/ui/Button';
import { Card } from '@/components/ui/Card';
import { Input, Select } from '@/components/ui/Input';
import { Panel } from '@/components/ui/Panel';
import { Pill } from '@/components/ui/Pill';
import {
Table,
TableBody,
@@ -128,19 +130,16 @@ export function DataBrowser() {
};
return (
<section className="mx-auto flex w-full max-w-[var(--console-width)] flex-col gap-4">
<header className="flex flex-wrap items-center justify-between gap-3">
<div>
<h1 className="text-base font-medium tracking-[-0.3px] text-[var(--text)]">Data</h1>
<p className="mt-0.5 text-xs text-[var(--text-muted)]">Collected events across all clients</p>
</div>
<div className="flex items-center gap-2">
<section className="w-full">
<AdminPageHeader
title="Events"
actions={
<>
<Button
type="button"
variant="icon"
variant="secondary"
size="icon"
icon="RefreshCw"
className="h-8 w-8 border border-[var(--border)]"
title="Refresh events"
aria-label="Refresh events"
loading={refreshing}
@@ -149,18 +148,19 @@ export function DataBrowser() {
<Button
type="button"
variant="primary"
size="sm"
size="xs"
icon="Download"
onClick={() => window.location.assign('/vcon/export')}
>
Export CSV
</Button>
</div>
</header>
</>
}
/>
<Card compact className="!p-0">
<Card compact className="mb-2.5 p-0">
<div className="grid grid-cols-1 gap-px bg-[var(--border)] sm:grid-cols-2 lg:grid-cols-5">
<div className="bg-[var(--surface)] p-3">
<div className="bg-[var(--surface)] p-2.5">
<Select
label="Client"
compact
@@ -175,7 +175,7 @@ export function DataBrowser() {
))}
</Select>
</div>
<div className="bg-[var(--surface)] p-3">
<div className="bg-[var(--surface)] p-2.5">
<Input
label="From"
compact
@@ -184,7 +184,7 @@ export function DataBrowser() {
onChange={(event) => setFromFilter(event.target.value)}
/>
</div>
<div className="bg-[var(--surface)] p-3">
<div className="bg-[var(--surface)] p-2.5">
<Input
label="To"
compact
@@ -193,17 +193,17 @@ export function DataBrowser() {
onChange={(event) => setToFilter(event.target.value)}
/>
</div>
<div className="bg-[var(--surface)] p-3">
<div className="bg-[var(--surface)] p-2.5">
<Input
label="Search payload"
label="Search"
compact
placeholder="e.g. sensor, user_id"
placeholder="Keyword..."
icon="Search"
value={searchFilter}
onChange={(event) => setSearchFilter(event.target.value)}
/>
</div>
<div className="flex items-end justify-end gap-2 bg-[var(--surface)] p-3">
<div className="flex items-end justify-end gap-1.5 bg-[var(--surface)] p-2.5">
<Button type="button" size="xs" icon="X" onClick={resetFilters}>
Reset
</Button>
@@ -216,11 +216,11 @@ export function DataBrowser() {
<Panel
title="Events"
meta={`${total.toLocaleString()} results · page ${page} of ${pageCount}`}
meta={`${total.toLocaleString()} · ${page}/${pageCount}`}
bodyClassName="overflow-hidden"
>
<TableWrap className="border-0">
<Table className="min-w-[760px] text-xs">
<Table className="min-w-[680px] text-[11px]">
<TableHeader>
<TableRow>
<TableHead>Time</TableHead>
@@ -235,11 +235,11 @@ export function DataBrowser() {
{errorMessage ? (
<TableEmpty colSpan={6} message={errorMessage} />
) : events.length === 0 ? (
<TableEmpty colSpan={6} message="No events match these filters." />
<TableEmpty colSpan={6} message="No matching events" />
) : (
events.map((event) => (
<TableRow key={event.eventId}>
<TableCell className="font-mono text-[var(--text)]">
<TableCell className="font-mono text-[10.5px] tabular-nums text-[var(--text)]">
{new Date(event.timestamp).toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
@@ -247,18 +247,18 @@ export function DataBrowser() {
hour12: false,
})}
</TableCell>
<TableCell className="font-mono text-[var(--accent)]">{event.clientId}</TableCell>
<TableCell className="hidden font-mono text-[var(--text-faint)] sm:table-cell">
<TableCell className="font-mono text-[11px] text-[var(--accent)]">{event.clientId}</TableCell>
<TableCell className="hidden font-mono text-[10.5px] text-[var(--text-faint)] sm:table-cell">
{event.eventId}
</TableCell>
<TableCell className="max-w-0 truncate font-mono text-[var(--text)]">
<TableCell className="max-w-0 truncate font-mono text-[11px] text-[var(--text)]">
{event.payload}
</TableCell>
<TableCell className="hidden font-mono md:table-cell">
<TableCell className="hidden font-mono text-[10.5px] tabular-nums md:table-cell">
{new TextEncoder().encode(event.payload).length} B
</TableCell>
<TableCell className="text-right">
<span className="inline-flex items-center gap-1.5 text-[var(--text-muted)]">
<span className="inline-flex items-center gap-1.5 text-[10.5px] text-[var(--text-muted)]">
<span className="h-1.5 w-1.5 bg-[var(--accent)]" />{event.status}
</span>
</TableCell>
@@ -268,10 +268,9 @@ export function DataBrowser() {
</TableBody>
</Table>
</TableWrap>
<footer className="flex flex-wrap items-center justify-between gap-3 border-t border-[var(--border)] px-4 py-2.5">
<p className="text-xs text-[var(--text-muted)]">
Showing <strong className="font-medium text-[var(--text)]">{firstVisible}–{lastVisible}</strong> of{' '}
<strong className="font-medium text-[var(--text)]">{total.toLocaleString()}</strong> events
<footer className="flex flex-wrap items-center justify-between gap-2 border-t border-[var(--border)] px-3 py-2">
<p className="font-mono text-[11px] tabular-nums text-[var(--text-muted)]">
{firstVisible}–{lastVisible} of {total.toLocaleString()}
</p>
<nav className="flex items-center gap-1" aria-label="Event pages">
<Button
@@ -279,35 +278,48 @@ export function DataBrowser() {
variant="icon"
size="icon"
icon="ChevronLeft"
className="h-7 w-7 border border-[var(--border)]"
className="h-6 w-6 border border-[var(--border)]"
aria-label="Previous page"
disabled={page <= 1}
onClick={() => setPage((current) => Math.max(1, current - 1))}
/>
{firstPage > 1 && (
<>
<PageButton pageNumber={1} active={page === 1} onSelect={setPage} />
{firstPage > 2 && <span className="px-1 text-xs text-[var(--text-faint)]">…</span>}
<Pill
active={page === 1}
aria-current={page === 1 ? 'page' : undefined}
className="min-w-6 justify-center px-1.5 font-mono tabular-nums"
onClick={() => setPage(1)}
>
1
</Pill>
{firstPage > 2 && <span className="px-1 text-[11px] text-[var(--text-faint)]">…</span>}
</>
)}
{visiblePages.map((pageNumber) => (
<PageButton
<Pill
key={pageNumber}
pageNumber={pageNumber}
active={page === pageNumber}
onSelect={setPage}
/>
aria-current={page === pageNumber ? 'page' : undefined}
className="min-w-6 justify-center px-1.5 font-mono tabular-nums"
onClick={() => setPage(pageNumber)}
>
{pageNumber}
</Pill>
))}
{firstPage + visiblePages.length - 1 < pageCount && (
<>
{firstPage + visiblePages.length < pageCount && (
<span className="px-1 text-xs text-[var(--text-faint)]">…</span>
<span className="px-1 text-[11px] text-[var(--text-faint)]">…</span>
)}
<PageButton
pageNumber={pageCount}
<Pill
active={page === pageCount}
onSelect={setPage}
/>
aria-current={page === pageCount ? 'page' : undefined}
className="min-w-6 justify-center px-1.5 font-mono tabular-nums"
onClick={() => setPage(pageCount)}
>
{pageCount}
</Pill>
</>
)}
<Button
@@ -315,7 +327,7 @@ export function DataBrowser() {
variant="icon"
size="icon"
icon="ChevronRight"
className="h-7 w-7 border border-[var(--border)]"
className="h-6 w-6 border border-[var(--border)]"
aria-label="Next page"
disabled={page >= pageCount}
onClick={() => setPage((current) => Math.min(pageCount, current + 1))}
@@ -326,28 +338,3 @@ export function DataBrowser() {
</section>
);
}
function PageButton({
pageNumber,
active,
onSelect,
}: {
pageNumber: number;
active: boolean;
onSelect: (page: number) => void;
}) {
return (
<button
type="button"
aria-current={active ? 'page' : undefined}
className={`grid h-7 min-w-7 place-items-center border px-2 text-xs transition-colors ${
active
? 'border-[var(--border-strong)] bg-[var(--surface-2)] text-[var(--text)]'
: 'border-[var(--border)] text-[var(--text-muted)] hover:bg-[var(--surface-2)] hover:text-[var(--text)]'
}`}
onClick={() => onSelect(pageNumber)}
>
{pageNumber}
</button>
);
}
+39 -56
View File
@@ -7,7 +7,7 @@ import { Panel } from '@/components/ui/Panel';
import { Pill } from '@/components/ui/Pill';
import { StatStrip } from '@/components/ui/StatStrip';
import { useToast } from '@/components/ui/Toast';
import { Braces, FileText, Info } from 'lucide-react';
import { Braces, FileText } from 'lucide-react';
import { useEffect, useMemo, useState } from 'react';
interface Client {
@@ -139,7 +139,7 @@ export function ExportWorkspace() {
const downloadExport = () => {
if (fromDate && toDate && fromDate > toDate) {
error('Invalid date range', 'The start date must be on or before the end date.');
error('Invalid date range', 'Start date must be on or before end date.');
return;
}
window.location.assign(exportUrl);
@@ -164,31 +164,26 @@ export function ExportWorkspace() {
};
return (
<section className="mx-auto w-full max-w-[var(--container-width)]">
<nav aria-label="Breadcrumb" className="mb-3 flex items-center gap-1.5 text-xs text-[var(--text-faint)]">
<span>Console</span>
<span aria-hidden="true" className="text-[var(--border-strong)]">/</span>
<span aria-current="page" className="text-[var(--text)]">Export</span>
</nav>
<AdminPageHeader title="Export" subtitle="Generate CSV or JSON exports from collected data" />
<section className="mx-auto w-full max-w-[var(--console-width)]">
<AdminPageHeader title="Export" />
<StatStrip
items={[
{ label: 'Stored files', value: files.length.toLocaleString() },
{ label: 'Stored rows', value: stats.rows.toLocaleString() },
{ label: 'Storage used', value: formatBytes(stats.bytes) },
{ label: 'Files', value: files.length.toLocaleString() },
{ label: 'Rows', value: stats.rows.toLocaleString() },
{ label: 'Storage', value: formatBytes(stats.bytes) },
{ label: 'Clients', value: stats.clients.toLocaleString() },
]}
/>
<div className="grid grid-cols-1 items-start gap-3 xl:grid-cols-5">
<Panel title="Export builder" meta="Estimate updates on change" bodyClassName="flex flex-col gap-4 p-4" className="min-w-0 xl:col-span-3">
<div className="grid grid-cols-1 items-start gap-2.5 xl:grid-cols-5">
<Panel title="Export builder" bodyClassName="flex flex-col gap-3 p-3" className="min-w-0 xl:col-span-3">
<div className="flex flex-wrap items-center gap-1">
<span className="mr-1.5 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">Quick range</span>
<span className="mr-1 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">Range</span>
{([
['today', 'Today'],
['7d', 'Last 7d'],
['30d', 'Last 30d'],
['7d', '7d'],
['30d', '30d'],
['all', 'All'],
] as const).map(([id, label]) => (
<Pill key={id} active={preset === id} onClick={() => setQuickRange(id)}>{label}</Pill>
@@ -196,50 +191,47 @@ export function ExportWorkspace() {
</div>
<div className="grid grid-cols-1 gap-px border border-[var(--border)] bg-[var(--border)] md:grid-cols-[1.2fr_1fr_1fr]">
<div className="min-w-0 bg-[var(--surface)] p-3">
<div className="min-w-0 bg-[var(--surface)] p-2.5">
<Select
label="Client"
compact
value={selectedClient}
onChange={(event) => setSelectedClient(event.target.value)}
className="border-0 bg-transparent px-0 focus:border-transparent"
>
<option value="all">All clients</option>
{clients.map((client) => <option key={client.clientId} value={client.clientId}>{client.name}</option>)}
</Select>
</div>
<div className="min-w-0 bg-[var(--surface)] p-3">
<Input label="From" compact type="date" value={fromDate} onChange={(event) => rangeChanged(setFromDate, event.target.value)} className="border-0 bg-transparent px-0 focus:border-transparent" />
<div className="min-w-0 bg-[var(--surface)] p-2.5">
<Input label="From" compact type="date" value={fromDate} onChange={(event) => rangeChanged(setFromDate, event.target.value)} />
</div>
<div className="min-w-0 bg-[var(--surface)] p-3">
<Input label="To" compact type="date" value={toDate} onChange={(event) => rangeChanged(setToDate, event.target.value)} className="border-0 bg-transparent px-0 focus:border-transparent" />
<div className="min-w-0 bg-[var(--surface)] p-2.5">
<Input label="To" compact type="date" value={toDate} onChange={(event) => rangeChanged(setToDate, event.target.value)} />
</div>
</div>
<fieldset className="flex flex-col gap-2">
<fieldset className="flex flex-col gap-1.5">
<legend className="text-[10px] uppercase tracking-wider text-[var(--text-faint)]">Format</legend>
<div className="grid grid-cols-1 gap-2 sm:grid-cols-2" role="radiogroup" aria-label="Export format">
<FormatOption value="csv" selected={format === 'csv'} label="CSV" hint="Comma-separated values" onSelect={setFormat} />
<FormatOption value="json" selected={format === 'json'} label="JSON" hint="Structured array" onSelect={setFormat} />
<div className="grid grid-cols-2 gap-2" role="radiogroup" aria-label="Export format">
<FormatOption value="csv" selected={format === 'csv'} label="CSV" onSelect={setFormat} />
<FormatOption value="json" selected={format === 'json'} label="JSON" onSelect={setFormat} />
</div>
</fieldset>
<div className="flex flex-col gap-2">
<span className="text-[10px] uppercase tracking-wider text-[var(--text-faint)]">Preview</span>
<div className="flex flex-wrap items-center gap-x-2 gap-y-1 border border-l-2 border-[var(--border)] border-l-[var(--accent)] bg-[var(--surface-2)] px-3 py-2 font-mono text-xs text-[var(--text-muted)]">
<Info className="h-3.5 w-3.5 text-[var(--accent)]" aria-hidden="true" />
<div className="flex flex-col gap-1.5">
<div className="flex flex-wrap items-center gap-x-2 gap-y-1 border border-[var(--border)] bg-[var(--surface-2)] px-2.5 py-1.5 font-mono text-[11px] tabular-nums text-[var(--text-muted)]">
<span><strong className="font-medium text-[var(--text)]">{preview.rows.toLocaleString()}</strong> rows</span>
<span aria-hidden="true">·</span>
<span><strong className="font-medium text-[var(--text)]">~{formatBytes(preview.bytes)}</strong> source size</span>
<span><strong className="font-medium text-[var(--text)]">~{formatBytes(preview.bytes)}</strong></span>
<span aria-hidden="true">·</span>
<span><strong className="font-medium text-[var(--text)]">{preview.files}</strong> files</span>
</div>
{loadError && <p role="alert" className="text-xs text-[var(--text-muted)]">{loadError}</p>}
{loadError && <p role="alert" className="text-[11px] text-[var(--text-muted)]">{loadError}</p>}
{fromDate && toDate && fromDate > toDate && (
<p role="alert" className="text-xs text-[var(--text-muted)]">Start date must be on or before end date.</p>
<p role="alert" className="text-[11px] text-[var(--text-muted)]">Start date must be on or before end date.</p>
)}
</div>
<div className="flex flex-wrap items-center justify-end gap-2 border-t border-[var(--border)] pt-3">
<div className="flex flex-wrap items-center justify-end gap-1.5 border-t border-[var(--border)] pt-2.5">
<Button type="button" size="xs" onClick={resetExport}>Reset</Button>
<Button type="button" variant="primary" size="xs" icon="Download" disabled={loading || Boolean(fromDate && toDate && fromDate > toDate)} onClick={downloadExport}>
Download {format.toUpperCase()}
@@ -248,22 +240,22 @@ export function ExportWorkspace() {
</Panel>
<Panel
title="Recent exports"
action={<a href="/vcon/storage" className="text-xs text-[var(--text-muted)] hover:text-[var(--text)]">View all</a>}
title="Files"
action={<a href="/vcon/storage" className="text-[11px] text-[var(--text-muted)] hover:text-[var(--text)]">View all</a>}
bodyClassName="divide-y divide-[var(--border)]"
className="min-w-0 xl:col-span-2"
>
{loading ? (
<p className="px-4 py-5 text-xs text-[var(--text-faint)]">Loading stored files...</p>
<p className="px-3 py-4 text-[11.5px] text-[var(--text-faint)]">Loading...</p>
) : sortedRecentFiles.length === 0 ? (
<p className="px-4 py-5 text-xs text-[var(--text-faint)]">No stored files available to export.</p>
<p className="px-3 py-4 text-[11.5px] text-[var(--text-faint)]">No files</p>
) : (
sortedRecentFiles.map((file) => (
<div key={`${file.clientId}/${file.filename}`} className="flex items-center gap-2.5 px-3.5 py-2.5 transition-colors hover:bg-[var(--surface-2)]">
<span className="shrink-0 border border-[var(--border-strong)] px-1.5 py-0.5 font-mono text-[9px] uppercase tracking-wider text-[var(--text-muted)]">CSV</span>
<div key={`${file.clientId}/${file.filename}`} className="flex items-center gap-2 px-3 py-2 transition-colors hover:bg-[var(--surface-2)]">
<span className="shrink-0 border border-[var(--border-strong)] px-1 py-0.5 font-mono text-[9px] uppercase tracking-wider text-[var(--text-muted)]">CSV</span>
<div className="min-w-0 flex-1">
<div className="truncate font-mono text-xs text-[var(--text)]">{file.filename}</div>
<div className="mt-0.5 truncate text-[10.5px] text-[var(--text-faint)]">
<div className="truncate font-mono text-[11.5px] text-[var(--text)]">{file.filename}</div>
<div className="truncate text-[10px] tabular-nums text-[var(--text-faint)]">
{file.clientId} · {relativeTime(file.modifiedAt, now)} · {file.linesCount.toLocaleString()} rows · {formatBytes(file.sizeBytes)}
</div>
</div>
@@ -273,10 +265,6 @@ export function ExportWorkspace() {
)}
</Panel>
</div>
<p className="mt-2 text-[11px] text-[var(--text-faint)]">
Exports are generated from CSV files on disk · Estimates are approximate · Large downloads are streamed
</p>
</section>
);
}
@@ -285,13 +273,11 @@ function FormatOption({
value,
selected,
label,
hint,
onSelect,
}: {
value: ExportFormat;
selected: boolean;
label: string;
hint: string;
onSelect: (value: ExportFormat) => void;
}) {
const FormatIcon = value === 'csv' ? FileText : Braces;
@@ -301,16 +287,13 @@ function FormatOption({
type="button"
role="radio"
aria-checked={selected}
className={`flex min-w-0 items-center gap-2.5 border px-3 py-2.5 text-left transition-colors ${selected ? 'border-[var(--border-strong)] bg-[var(--surface-2)]' : 'border-[var(--border)] hover:border-[var(--border-strong)]'}`}
className={`flex min-w-0 items-center gap-2 border px-2.5 py-1.5 text-left transition-colors ${selected ? 'border-[var(--border-strong)] bg-[var(--surface-2)]' : 'border-[var(--border)] hover:border-[var(--border-strong)]'}`}
onClick={() => onSelect(value)}
>
<span className={`grid h-7 w-7 shrink-0 place-items-center border ${selected ? 'border-[var(--border-strong)] text-[var(--accent)]' : 'border-[var(--border)] text-[var(--text-muted)]'}`}>
<FormatIcon className="h-3.5 w-3.5" aria-hidden="true" />
</span>
<span className="min-w-0">
<span className="block text-xs font-medium leading-tight text-[var(--text)]">{label}</span>
<span className="mt-0.5 block truncate text-[10.5px] text-[var(--text-faint)]">{hint}</span>
<span className={`grid h-6 w-6 shrink-0 place-items-center border ${selected ? 'border-[var(--border-strong)] text-[var(--accent)]' : 'border-[var(--border)] text-[var(--text-muted)]'}`}>
<FormatIcon className="h-3 w-3" aria-hidden="true" />
</span>
<span className="text-[11.5px] font-medium text-[var(--text)]">{label}</span>
</button>
);
}
+20 -41
View File
@@ -1,11 +1,11 @@
'use client';
import { Button } from '@/components/ui/Button';
import { CopyButton } from '@/components/ui/CopyButton';
import { Input, Textarea } from '@/components/ui/Input';
import { Input } from '@/components/ui/Input';
import { Modal } from '@/components/ui/Modal';
import { useToast } from '@/components/ui/Toast';
import { useState } from 'react';
import { CredentialsDisplay } from './ClientsTable';
import type { ClientCredentials } from './clients/types';
interface NewClientModalProps {
@@ -24,12 +24,19 @@ export function NewClientModal({ open, onClose, onCreated }: NewClientModalProps
const createClient = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
const trimmedId = clientId.trim();
const trimmedName = name.trim();
if (!trimmedId || !trimmedName) {
error('Validation error', 'Client ID and Name are required.');
return;
}
const clampedRateLimit = Math.max(1, Math.min(5000, Number(rateLimit) || 100));
setSubmitting(true);
try {
const response = await fetch('/api/clients', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ clientId: clientId.trim(), name: name.trim(), rateLimit: Number(rateLimit) || 100 }),
body: JSON.stringify({ clientId: trimmedId, name: trimmedName, rateLimit: clampedRateLimit }),
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Client registration failed');
@@ -53,43 +60,40 @@ export function NewClientModal({ open, onClose, onCreated }: NewClientModalProps
<Modal
isOpen={open}
onClose={onClose}
title="Create client"
title="New client"
maxWidth="xs"
footer={
<>
<Button type="button" variant="ghost" size="sm" onClick={onClose}>Cancel</Button>
<Button type="submit" form="new-client-form" variant="primary" size="sm" loading={submitting}>Create client</Button>
<Button type="button" variant="ghost" size="xs" onClick={onClose}>Cancel</Button>
<Button type="submit" form="new-client-form" variant="primary" size="xs" loading={submitting}>Create</Button>
</>
}
>
<form id="new-client-form" onSubmit={createClient} className="flex flex-col gap-3.5">
<form id="new-client-form" onSubmit={createClient} className="flex flex-col gap-2.5">
<Input
compact
label="Client ID"
placeholder="e.g. py_order_service_04"
placeholder="py_order_service_04"
value={clientId}
onChange={(event) => setClientId(event.target.value)}
className="h-8 border-[var(--border)] bg-[var(--bg)] px-2.5 text-[12.5px] focus:border-[var(--border-strong)]"
required
/>
<Input
compact
label="Client name"
placeholder="e.g. Order Service"
label="Name"
placeholder="Order Service"
value={name}
onChange={(event) => setName(event.target.value)}
className="h-8 border-[var(--border)] bg-[var(--bg)] px-2.5 text-[12.5px] focus:border-[var(--border-strong)]"
required
/>
<Input
compact
label="Rate limit (requests per second)"
label="Rate limit (req/s)"
type="number"
min="1"
max="5000"
value={rateLimit}
onChange={(event) => setRateLimit(event.target.value)}
className="h-8 border-[var(--border)] bg-[var(--bg)] px-2.5 text-[12.5px] focus:border-[var(--border-strong)]"
/>
</form>
</Modal>
@@ -98,35 +102,10 @@ export function NewClientModal({ open, onClose, onCreated }: NewClientModalProps
isOpen={Boolean(credentials)}
onClose={() => setCredentials(null)}
title={`Credentials: ${credentials?.clientId || ''}`}
description="Copy these credentials now. The secret is only shown after creation."
footer={<Button type="button" size="sm" onClick={() => setCredentials(null)}>Close</Button>}
footer={<Button type="button" size="xs" onClick={() => setCredentials(null)}>Close</Button>}
>
{credentials && (
<div className="flex flex-col gap-3">
<Credential label="Client ID" value={credentials.clientId} />
<Credential label="Client secret key" value={credentials.secret} />
<div className="flex flex-col gap-1.5">
<div className="flex items-center justify-between gap-2">
<label htmlFor="new-client-token" className="text-xs uppercase text-[var(--text-faint)]">JWT handshake bearer token</label>
<CopyButton value={credentials.token} />
</div>
<Textarea id="new-client-token" readOnly value={credentials.token} rows={4} className="font-mono text-xs text-[var(--accent)]" />
</div>
</div>
)}
{credentials && <CredentialsDisplay credentials={credentials} />}
</Modal>
</>
);
}
function Credential({ label, value }: { label: string; value: string }) {
return (
<div className="flex flex-col gap-1.5">
<span className="text-xs uppercase text-[var(--text-faint)]">{label}</span>
<div className="flex min-w-0 items-center justify-between gap-2 border border-[var(--border)] bg-[var(--bg)] p-2.5">
<code className="min-w-0 truncate font-mono text-xs text-[var(--text)]">{value}</code>
<CopyButton value={value} />
</div>
</div>
);
}
+46 -76
View File
@@ -1,5 +1,6 @@
'use client';
import { AdminPageHeader } from '@/components/layout/AdminPageHeader';
import { Button } from '@/components/ui/Button';
import { FormSwitch } from '@/components/ui/Form';
import { Input } from '@/components/ui/Input';
@@ -38,7 +39,6 @@ const TABS = [
{ id: 'connections', label: 'Connections' },
{ id: 'storage', label: 'Storage' },
{ id: 'security', label: 'Security' },
{ id: 'notifications', label: 'Notifications' },
];
type TabId = (typeof TABS)[number]['id'];
@@ -90,8 +90,8 @@ export function SettingsWorkspace() {
setServerPort(Number((settingsData.settings as PublicSettings).serverPort ?? 4000));
setStoragePath(String(storageData.stats?.storageDirectory ?? ''));
})
.catch((loadError) => {
error('Settings unavailable', loadError instanceof Error ? loadError.message : 'Unable to load settings');
.catch(() => {
error('Settings load failed', 'Using default runtime settings.');
})
.finally(() => setLoading(false));
}, [error]);
@@ -107,21 +107,31 @@ export function SettingsWorkspace() {
const saveSettings = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
const normalized: EditableSettings = {
maxEventsPerSec: Math.max(1, Math.min(10000, settings.maxEventsPerSec || DEFAULT_SETTINGS.maxEventsPerSec)),
maxPayloadSizeKb: Math.max(1, Math.min(5120, settings.maxPayloadSizeKb || DEFAULT_SETTINGS.maxPayloadSizeKb)),
batchFlushThreshold: Math.max(1, settings.batchFlushThreshold || DEFAULT_SETTINGS.batchFlushThreshold),
batchFlushIntervalMs: Math.max(100, settings.batchFlushIntervalMs || DEFAULT_SETTINGS.batchFlushIntervalMs),
fileRotationMb: Math.max(1, settings.fileRotationMb || DEFAULT_SETTINGS.fileRotationMb),
enableIdempotency: settings.enableIdempotency,
autoPruneDays: Math.max(1, Math.min(365, settings.autoPruneDays || DEFAULT_SETTINGS.autoPruneDays)),
};
setSaving(true);
try {
const response = await fetch('/api/settings', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
...settings,
...normalized,
...(jwtSecret.trim() ? { jwtSecret: jwtSecret.trim() } : {}),
}),
});
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Settings update failed');
setSavedSettings(settings);
setSettings(normalized);
setSavedSettings(normalized);
setJwtSecret('');
success('Settings saved', 'Supported runtime settings have been applied.');
success('Settings saved', 'Runtime settings updated.');
} catch (saveError) {
error('Save failed', saveError instanceof Error ? saveError.message : 'Unable to save settings');
} finally {
@@ -135,16 +145,8 @@ export function SettingsWorkspace() {
};
return (
<section className="mx-auto w-full max-w-[var(--container-width)]">
<nav aria-label="Breadcrumb" className="mb-3 flex items-center gap-1.5 text-xs text-[var(--text-faint)]">
<span>Console</span>
<span aria-hidden="true" className="text-[var(--border-strong)]">/</span>
<span aria-current="page" className="text-[var(--text)]">Settings</span>
</nav>
<header className="mb-4">
<h1 className="text-base font-medium tracking-tight text-[var(--text)]">Settings</h1>
<p className="mt-0.5 text-xs text-[var(--text-muted)]">Configure your DataStack instance</p>
</header>
<section className="mx-auto w-full max-w-[var(--console-width)]">
<AdminPageHeader title="Settings" />
<SettingsTabs items={TABS} value={activeTab} onChange={(tab) => setActiveTab(tab as TabId)} />
@@ -155,29 +157,23 @@ export function SettingsWorkspace() {
aria-labelledby={`settings-tab-${activeTab}`}
className="border border-t-0 border-[var(--border)] bg-[var(--surface)]"
>
{loading ? (
<p className="p-4 text-xs text-[var(--text-faint)]">Loading settings...</p>
) : (
<>
{activeTab === 'general' && (
<>
<SettingsGroup title="Identity">
<SettingsField label="Instance name" hint="Shown in dashboard headers and emails">
<SettingsField label="Instance name">
<Input compact value="DataStack" readOnly className="border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-muted)]" />
</SettingsField>
<SettingsField label="Base URL" hint="Current browser origin">
<Input compact value={baseUrl} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11.5px] text-[var(--text-muted)]" />
</SettingsField>
<SettingsField label="Instance ID" hint="Instance identifier is not configured">
<Input compact value="Not configured" readOnly className="border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-muted)]" />
<SettingsField label="Base URL">
<Input compact value={baseUrl} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11px] text-[var(--text-muted)]" />
</SettingsField>
</SettingsGroup>
<SettingsGroup title="Throughput">
<SettingsField label="Events per second" hint="Global cap; client limits may be lower">
<SettingsField label="Events per second">
<Input compact type="number" min="1" max="10000" value={settings.maxEventsPerSec} onChange={(event) => updateNumber('maxEventsPerSec', event.target.value)} />
</SettingsField>
<SettingsField label="Enable idempotency" hint="Reject duplicate clientId + eventId combinations">
<FormSwitch label="Deduplicate incoming events" checked={settings.enableIdempotency} onChange={(enableIdempotency) => setSettings((current) => ({ ...current, enableIdempotency }))} />
<SettingsField label="Idempotency">
<FormSwitch label="Deduplicate events" checked={settings.enableIdempotency} onChange={(enableIdempotency) => setSettings((current) => ({ ...current, enableIdempotency }))} />
</SettingsField>
</SettingsGroup>
</>
@@ -186,22 +182,19 @@ export function SettingsWorkspace() {
{activeTab === 'connections' && (
<>
<SettingsGroup title="WebSocket server">
<SettingsField label="Public WebSocket URL" hint="Clients connect through the configured host">
<Input compact value={webSocketUrl} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11.5px] text-[var(--text-muted)]" />
<SettingsField label="WebSocket URL">
<Input compact value={webSocketUrl} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11px] text-[var(--text-muted)]" />
</SettingsField>
<SettingsField label="Socket port" hint="Express process port">
<SettingsField label="Socket port">
<Input compact type="number" value={serverPort} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[var(--text-muted)]" />
</SettingsField>
</SettingsGroup>
<SettingsGroup title="Event buffer">
<SettingsField label="Batch flush threshold" hint="Write buffered rows to CSV at this count">
<SettingsField label="Batch flush threshold">
<Input compact type="number" min="1" value={settings.batchFlushThreshold} onChange={(event) => updateNumber('batchFlushThreshold', event.target.value)} />
</SettingsField>
<SettingsField label="Flush interval" hint="Maximum time before buffered rows are written">
<div className="flex items-center gap-0">
<Input compact type="number" min="100" value={settings.batchFlushIntervalMs} onChange={(event) => updateNumber('batchFlushIntervalMs', event.target.value)} className="border-[var(--border)] font-mono" />
<span className="flex h-9 items-center border border-l-0 border-[var(--border)] bg-[var(--surface-2)] px-2.5 text-xs text-[var(--text-muted)]">ms</span>
</div>
<SettingsField label="Flush interval">
<Input compact type="number" min="100" suffix="ms" value={settings.batchFlushIntervalMs} onChange={(event) => updateNumber('batchFlushIntervalMs', event.target.value)} className="font-mono" />
</SettingsField>
</SettingsGroup>
</>
@@ -210,69 +203,46 @@ export function SettingsWorkspace() {
{activeTab === 'storage' && (
<>
<SettingsGroup title="CSV files">
<SettingsField label="Root path" hint="Current server storage directory">
<Input compact value={storagePath || 'Unavailable'} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11.5px] text-[var(--text-muted)]" />
<SettingsField label="Root path">
<Input compact value={storagePath || 'Unavailable'} readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11px] text-[var(--text-muted)]" />
</SettingsField>
<SettingsField label="File rotation" hint="Files rotate daily and at the configured size limit">
<div className="flex items-center gap-0">
<Input compact type="number" min="1" value={settings.fileRotationMb} onChange={(event) => updateNumber('fileRotationMb', event.target.value)} className="border-[var(--border)] font-mono" />
<span className="flex h-9 items-center border border-l-0 border-[var(--border)] bg-[var(--surface-2)] px-2.5 text-xs text-[var(--text-muted)]">MB</span>
</div>
<SettingsField label="File rotation">
<Input compact type="number" min="1" suffix="MB" value={settings.fileRotationMb} onChange={(event) => updateNumber('fileRotationMb', event.target.value)} className="font-mono" />
</SettingsField>
<SettingsField label="Retention" hint="Retention value is stored; automatic pruning is not enabled">
<div className="flex items-center gap-0">
<Input compact type="number" min="1" max="365" value={settings.autoPruneDays} onChange={(event) => updateNumber('autoPruneDays', event.target.value)} className="border-[var(--border)] font-mono" />
<span className="flex h-9 items-center border border-l-0 border-[var(--border)] bg-[var(--surface-2)] px-2.5 text-xs text-[var(--text-muted)]">days</span>
</div>
<SettingsField label="Retention">
<Input compact type="number" min="1" max="365" suffix="days" value={settings.autoPruneDays} onChange={(event) => updateNumber('autoPruneDays', event.target.value)} className="font-mono" />
</SettingsField>
</SettingsGroup>
<SettingsGroup title="Schema">
<SettingsField label="Row format" hint="Fixed CSV schema">
<Input compact value="clientId, eventId, timestamp, payload" readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11.5px] text-[var(--text-muted)]" />
<SettingsField label="Row format">
<Input compact value="clientId, eventId, timestamp, payload" readOnly className="border-[var(--border)] bg-[var(--surface-2)] font-mono text-[11px] text-[var(--text-muted)]" />
</SettingsField>
</SettingsGroup>
</>
)}
{activeTab === 'security' && (
<>
<SettingsGroup title="Authentication">
<SettingsField label="JWT secret" hint="Changing the secret invalidates existing client tokens">
<Input compact type="password" autoComplete="new-password" value={jwtSecret} onChange={(event) => setJwtSecret(event.target.value)} placeholder="Leave blank to keep the current secret" />
<SettingsField label="JWT secret">
<Input compact type="password" autoComplete="new-password" value={jwtSecret} onChange={(event) => setJwtSecret(event.target.value)} placeholder="New secret..." />
</SettingsField>
<SettingsField label="Payload size limit" hint="Maximum accepted event payload size">
<div className="flex items-center gap-0">
<Input compact type="number" min="1" max="5120" value={settings.maxPayloadSizeKb} onChange={(event) => updateNumber('maxPayloadSizeKb', event.target.value)} className="border-[var(--border)] font-mono" />
<span className="flex h-9 items-center border border-l-0 border-[var(--border)] bg-[var(--surface-2)] px-2.5 text-xs text-[var(--text-muted)]">KB</span>
</div>
<SettingsField label="Payload size limit">
<Input compact type="number" min="1" max="5120" suffix="KB" value={settings.maxPayloadSizeKb} onChange={(event) => updateNumber('maxPayloadSizeKb', event.target.value)} className="font-mono" />
</SettingsField>
</SettingsGroup>
<SettingsGroup title="Configuration">
<p className="text-xs leading-relaxed text-[var(--text-faint)]">Allowed origins and token expiration are controlled by deployment configuration and are not editable from this console.</p>
</SettingsGroup>
</>
)}
{activeTab === 'notifications' && (
<SettingsGroup title="Delivery">
<p className="text-xs leading-relaxed text-[var(--text-faint)]">Email and webhook notification delivery are not configured for this instance.</p>
</SettingsGroup>
)}
</>
)}
</div>
<footer className="flex flex-wrap items-center gap-2 border border-t-0 border-[var(--border)] bg-[var(--surface)] px-4 py-2.5">
<div className="flex flex-1 items-center gap-1.5 text-xs text-[var(--text-muted)]" role="status">
<footer className="flex flex-wrap items-center gap-2 border border-t-0 border-[var(--border)] bg-[var(--surface)] px-3 py-2">
<div className="flex flex-1 items-center gap-1.5 text-[11px] text-[var(--text-muted)]" role="status">
<span className={`h-1.5 w-1.5 ${isDirty ? 'bg-[var(--warning)]' : 'bg-[var(--accent)]'}`} />
{loading ? 'Loading settings' : isDirty ? 'Unsaved changes' : 'All changes saved'}
{loading ? 'Loading' : isDirty ? 'Unsaved' : 'Saved'}
</div>
<Button type="button" size="xs" disabled={!isDirty || saving} onClick={discardChanges}>Discard</Button>
<Button type="submit" variant="primary" size="xs" icon="Save" loading={saving} disabled={loading || !isDirty}>Save changes</Button>
<Button type="submit" variant="primary" size="xs" icon="Save" loading={saving} disabled={loading || !isDirty}>Save</Button>
</footer>
</form>
<p className="mt-3 text-[11px] text-[var(--text-faint)]">Some settings require a service restart to take effect.</p>
</section>
);
}
-1
View File
@@ -1,6 +1,5 @@
export * from "./AdminLogin";
export * from "./ClientsFilters";
export * from "./ClientsManager";
export * from "./ClientsTable";
export * from "./DataBrowser";
export * from "./ExportWorkspace";
+7 -7
View File
@@ -42,10 +42,10 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
};
const sizeStyles = {
default: 'min-h-10 px-4 text-[13.5px] gap-2',
sm: 'h-9 px-3 text-[12.5px] gap-1.5',
xs: 'h-8 px-2.5 text-[12px] gap-1.5',
icon: 'w-9 h-9 p-0',
default: 'min-h-8.5 px-3 text-[12px] gap-1.5',
sm: 'h-7.5 px-2.5 text-[11.5px] gap-1.5',
xs: 'h-7 px-2 text-[11px] gap-1',
icon: 'w-7.5 h-7.5 p-0',
};
return (
@@ -61,15 +61,15 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
{...props}
>
{loading ? (
<Icon name="Loader2" size={size === 'sm' || size === 'xs' ? 12 : 14} className="animate-spin" />
<Icon name="Loader2" size={11} className="animate-spin" />
) : (
icon && iconPosition === 'left' && (
<Icon name={icon} size={size === 'sm' || size === 'xs' ? 12 : 14} />
<Icon name={icon} size={11} />
)
)}
{children && <span>{children}</span>}
{!loading && icon && iconPosition === 'right' && (
<Icon name={icon} size={size === 'sm' || size === 'xs' ? 12 : 14} />
<Icon name={icon} size={11} />
)}
</button>
);
+7 -7
View File
@@ -25,8 +25,8 @@ export const Card: React.FC<CardProps> = ({
className={cn(
'transition-colors',
variantStyles[variant],
className,
compact ? 'p-4' : 'p-5 sm:p-6'
compact ? 'p-3' : 'p-4 sm:p-5',
className
)}
{...props}
>
@@ -42,7 +42,7 @@ export const CardHeader: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({
}) => (
<div
className={cn(
'flex items-center justify-between gap-3 pb-3 mb-3 border-b border-[var(--border)]',
'flex items-center justify-between gap-2 pb-2 mb-2 border-b border-[var(--border)]',
className
)}
{...props}
@@ -56,7 +56,7 @@ export const CardTitle: React.FC<React.HTMLAttributes<HTMLHeadingElement>> = ({
children,
...props
}) => (
<h3 className={cn('text-[15px] font-semibold text-[var(--text)] leading-snug', className)} {...props}>
<h3 className={cn('text-[12px] font-medium text-[var(--text)] leading-snug', className)} {...props}>
{children}
</h3>
);
@@ -66,7 +66,7 @@ export const CardDescription: React.FC<React.HTMLAttributes<HTMLParagraphElement
children,
...props
}) => (
<p className={cn('text-[13px] text-[var(--text-muted)] leading-relaxed', className)} {...props}>
<p className={cn('text-[11.5px] text-[var(--text-muted)] leading-relaxed', className)} {...props}>
{children}
</p>
);
@@ -76,7 +76,7 @@ export const CardContent: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({
children,
...props
}) => (
<div className={cn('text-[14px]', className)} {...props}>
<div className={cn('text-[12px]', className)} {...props}>
{children}
</div>
);
@@ -88,7 +88,7 @@ export const CardFooter: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({
}) => (
<div
className={cn(
'flex items-center justify-between gap-3 pt-3 mt-3 border-t border-[var(--border)] text-[13px]',
'flex items-center justify-between gap-2 pt-2 mt-2 border-t border-[var(--border)] text-[11.5px]',
className
)}
{...props}
+4 -4
View File
@@ -15,21 +15,21 @@ interface ClientListProps {
export const ClientList: React.FC<ClientListProps> = ({ clients, limit = 4 }) => (
<div className="divide-y divide-[var(--border)]">
{clients.slice(0, limit).map((client) => (
<div key={client.clientId} className="flex min-w-0 items-center justify-between gap-3 px-4 py-2">
<div key={client.clientId} className="flex min-w-0 items-center justify-between gap-2.5 px-3 py-1.5">
<div className="flex min-w-0 items-center gap-2">
<span className={client.status === 'active' ? 'h-1.5 w-1.5 shrink-0 bg-[var(--accent)]' : 'h-1.5 w-1.5 shrink-0 bg-[var(--text-faint)]'} />
<div className="min-w-0">
<p className="truncate text-[12px] font-medium text-[var(--text)]">{client.name}</p>
<p className="truncate text-[11.5px] font-medium text-[var(--text)]">{client.name}</p>
<p className="truncate font-mono text-[10px] text-[var(--text-faint)]">{client.clientId}</p>
</div>
</div>
<span className="shrink-0 font-mono text-[11px] text-[var(--text-muted)]">
<span className="shrink-0 font-mono text-[10.5px] tabular-nums text-[var(--text-muted)]">
{client.totalEvents.toLocaleString()}
</span>
</div>
))}
{clients.length === 0 && (
<p className="px-4 py-5 text-[12px] text-[var(--text-faint)]">No registered clients.</p>
<p className="px-3 py-4 text-[11px] text-[var(--text-faint)]">No clients</p>
)}
</div>
);
+10 -4
View File
@@ -1,12 +1,18 @@
import { cn } from '@/lib/utils';
import React from 'react';
interface CodeBlockProps {
interface CodeBlockProps extends React.HTMLAttributes<HTMLPreElement> {
children: React.ReactNode;
className?: string;
}
export const CodeBlock: React.FC<CodeBlockProps> = ({ children, className = '' }) => (
<pre className={`overflow-x-auto bg-[var(--surface)] p-4 font-mono text-[12px] leading-relaxed text-[var(--text-muted)] ${className}`}>
export const CodeBlock: React.FC<CodeBlockProps> = ({ children, className, ...props }) => (
<pre
className={cn(
'overflow-x-auto bg-[var(--bg-main)] p-3 font-mono text-[11.5px] leading-relaxed text-[var(--text)]',
className
)}
{...props}
>
<code>{children}</code>
</pre>
);
+7 -11
View File
@@ -6,7 +6,7 @@ export const Form: React.FC<React.FormHTMLAttributes<HTMLFormElement>> = ({
children,
...props
}) => (
<form className={cn('flex flex-col gap-5', className)} {...props}>
<form className={cn('flex flex-col gap-3', className)} {...props}>
{children}
</form>
);
@@ -16,7 +16,7 @@ export const FormField: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({
children,
...props
}) => (
<div className={cn('flex flex-col gap-2 w-full', className)} {...props}>
<div className={cn('flex flex-col gap-1.5 w-full', className)} {...props}>
{children}
</div>
);
@@ -26,7 +26,7 @@ export const FormRow: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({
children,
...props
}) => (
<div className={cn('grid grid-cols-1 sm:grid-cols-2 gap-4 w-full', className)} {...props}>
<div className={cn('grid grid-cols-1 sm:grid-cols-2 gap-3 w-full', className)} {...props}>
{children}
</div>
);
@@ -35,25 +35,21 @@ export const FormSwitch: React.FC<{
label: string;
checked: boolean;
onChange: (checked: boolean) => void;
description?: string;
disabled?: boolean;
}> = ({ label, checked, onChange, description, disabled = false }) => (
}> = ({ label, checked, onChange, disabled = false }) => (
<label
className={cn(
'flex items-center justify-between gap-4 p-4 border border-[var(--border)] bg-[var(--bg-main)] cursor-pointer select-none transition-colors hover:bg-[var(--bg-hover)]',
'flex items-center justify-between gap-3 px-2.5 py-1.5 border border-[var(--border)] bg-[var(--bg-main)] cursor-pointer select-none transition-colors hover:bg-[var(--bg-hover)]',
disabled && 'opacity-50 cursor-not-allowed'
)}
>
<div className="flex flex-col">
<span className="text-[14px] font-medium text-[var(--text)]">{label}</span>
{description && <span className="text-[12px] text-[var(--text-muted)]">{description}</span>}
</div>
<span className="text-[11.5px] text-[var(--text)]">{label}</span>
<input
type="checkbox"
checked={checked}
disabled={disabled}
onChange={(e) => onChange(e.target.checked)}
className="w-5 h-5 accent-[var(--accent)] cursor-pointer shrink-0"
className="w-3.5 h-3.5 accent-[var(--accent)] cursor-pointer shrink-0"
/>
</label>
);
+31 -13
View File
@@ -7,10 +7,12 @@ export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement>
error?: string;
icon?: string;
compact?: boolean;
suffix?: string;
rightElement?: React.ReactNode;
}
export const Input = React.forwardRef<HTMLInputElement, InputProps>(
({ label, error, icon, compact = false, className, id, ...props }, ref) => {
({ label, error, icon, compact = false, suffix, rightElement, className, id, ...props }, ref) => {
const inputId = id || (label ? label.toLowerCase().replace(/\s+/g, '-') : undefined);
return (
@@ -18,15 +20,15 @@ export const Input = React.forwardRef<HTMLInputElement, InputProps>(
{label && (
<label
htmlFor={inputId}
className="text-[12px] font-medium text-[var(--text-muted)]"
className="text-[10.5px] font-medium text-[var(--text-muted)]"
>
{label}
</label>
)}
<div className="relative flex items-center w-full">
{icon && (
<div className="absolute left-2.5 flex items-center pointer-events-none text-[var(--text-dim)]">
<Icon name={icon} size={13} />
<div className="absolute left-2 flex items-center pointer-events-none text-[var(--text-dim)]">
<Icon name={icon} size={12} />
</div>
)}
<input
@@ -34,15 +36,31 @@ export const Input = React.forwardRef<HTMLInputElement, InputProps>(
ref={ref}
className={cn(
'w-full bg-[var(--bg-main)] text-[var(--text)] border border-[var(--border-strong)] placeholder:text-[var(--text-dim)] transition-colors focus:outline-none focus:border-[var(--accent)] disabled:opacity-50 disabled:cursor-not-allowed',
compact ? 'h-9 px-3 text-[13px]' : 'h-10 px-3.5 text-[14px]',
icon && 'pl-8',
compact ? 'h-7.5 px-2.5 text-[11.5px]' : 'h-8.5 px-3 text-[12px]',
icon && 'pl-7',
rightElement && 'pr-8',
error && 'border-[var(--danger)]',
className
)}
{...props}
/>
{rightElement && (
<div className="absolute right-0 top-0 bottom-0 flex items-center">
{rightElement}
</div>
{error && <span className="text-[12px] text-[var(--danger)]">{error}</span>}
)}
{suffix && (
<span
className={cn(
'flex shrink-0 items-center border border-l-0 border-[var(--border-strong)] bg-[var(--surface-2)] text-[var(--text-muted)] select-none',
compact ? 'h-7.5 px-2 text-[11px]' : 'h-8.5 px-2.5 text-[11.5px]'
)}
>
{suffix}
</span>
)}
</div>
{error && <span className="text-[11px] text-[var(--danger)]">{error}</span>}
</div>
);
}
@@ -64,7 +82,7 @@ export const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
{label && (
<label
htmlFor={textareaId}
className="text-[12px] font-medium text-[var(--text-muted)]"
className="text-[10.5px] font-medium text-[var(--text-muted)]"
>
{label}
</label>
@@ -73,13 +91,13 @@ export const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
id={textareaId}
ref={ref}
className={cn(
'w-full bg-[var(--bg-main)] text-[var(--text)] border border-[var(--border-strong)] p-3.5 text-[14px] placeholder:text-[var(--text-dim)] focus:outline-none focus:border-[var(--accent)] min-h-[96px] resize-y font-mono',
'w-full bg-[var(--bg-main)] text-[var(--text)] border border-[var(--border-strong)] p-2.5 text-[12px] placeholder:text-[var(--text-dim)] focus:outline-none focus:border-[var(--accent)] min-h-[80px] resize-y font-mono',
error && 'border-[var(--danger)]',
className
)}
{...props}
/>
{error && <span className="text-[12px] text-[var(--danger)]">{error}</span>}
{error && <span className="text-[11px] text-[var(--danger)]">{error}</span>}
</div>
);
}
@@ -103,7 +121,7 @@ export const Select = React.forwardRef<HTMLSelectElement, SelectProps>(
{label && (
<label
htmlFor={selectId}
className="text-[12px] font-medium text-[var(--text-muted)]"
className="text-[10.5px] font-medium text-[var(--text-muted)]"
>
{label}
</label>
@@ -113,7 +131,7 @@ export const Select = React.forwardRef<HTMLSelectElement, SelectProps>(
ref={ref}
className={cn(
'w-full bg-[var(--bg-main)] text-[var(--text)] border border-[var(--border-strong)] focus:outline-none focus:border-[var(--accent)] cursor-pointer',
compact ? 'h-9 px-2.5 text-[13px]' : 'h-10 px-3 text-[14px]',
compact ? 'h-7.5 px-2 text-[11.5px]' : 'h-8.5 px-2.5 text-[12px]',
error && 'border-[var(--danger)]',
className
)}
@@ -127,7 +145,7 @@ export const Select = React.forwardRef<HTMLSelectElement, SelectProps>(
))
: children}
</select>
{error && <span className="text-[12px] text-[var(--danger)]">{error}</span>}
{error && <span className="text-[11px] text-[var(--danger)]">{error}</span>}
</div>
);
}
+12 -19
View File
@@ -7,7 +7,6 @@ export interface ModalProps {
isOpen: boolean;
onClose: () => void;
title: string;
description?: string;
children: React.ReactNode;
footer?: React.ReactNode;
maxWidth?: 'xs' | 'sm' | 'md' | 'lg';
@@ -17,7 +16,6 @@ export const Modal: React.FC<ModalProps> = ({
isOpen,
onClose,
title,
description,
children,
footer,
maxWidth = 'md',
@@ -41,44 +39,39 @@ export const Modal: React.FC<ModalProps> = ({
if (!isOpen) return null;
const maxWidthStyles = {
xs: 'max-w-[440px]',
sm: 'max-w-[480px]',
md: 'max-w-[640px]',
lg: 'max-w-[800px]',
xs: 'max-w-[380px]',
sm: 'max-w-[420px]',
md: 'max-w-[540px]',
lg: 'max-w-[680px]',
};
return (
<div className="fixed inset-0 z-50 flex items-center justify-center p-3 sm:p-6 bg-black/60">
<div className="fixed inset-0 z-50 flex items-center justify-center p-3 bg-black/60">
<div
className={cn(
'w-full bg-[var(--bg-elevated)] border border-[var(--border-strong)] text-[var(--text)] flex flex-col max-h-[calc(100dvh-1.5rem)] sm:max-h-[min(88dvh,800px)] overflow-hidden animate-in fade-in zoom-in-95 duration-150',
'w-full bg-[var(--bg-elevated)] border border-[var(--border-strong)] text-[var(--text)] flex flex-col max-h-[calc(100dvh-1.5rem)] sm:max-h-[min(86dvh,720px)] overflow-hidden animate-in fade-in zoom-in-95 duration-150',
maxWidthStyles[maxWidth]
)}
>
<div className="flex items-start justify-between gap-4 p-4 sm:px-6 sm:py-5 border-b border-[var(--border)] shrink-0">
<div className="min-w-0">
<h2 className="text-[18px] font-semibold text-[var(--text)] leading-snug">{title}</h2>
{description && (
<p className="text-[13px] text-[var(--text-muted)] mt-1.5">{description}</p>
)}
</div>
<div className="flex items-center justify-between gap-3 px-3.5 py-2.5 border-b border-[var(--border)] shrink-0">
<h2 className="text-[13px] font-medium text-[var(--text)] leading-snug truncate">{title}</h2>
<Button
size="icon"
variant="ghost"
onClick={onClose}
aria-label="Close dialog"
className="w-9 h-9 text-[var(--text-dim)] hover:text-[var(--text)]"
className="w-6.5 h-6.5 text-[var(--text-dim)] hover:text-[var(--text)]"
>
<Icon name="X" size={14} />
<Icon name="X" size={12} />
</Button>
</div>
<div className="p-4 sm:p-6 overflow-y-auto flex-1 text-[14px] flex flex-col gap-4">
<div className="p-3.5 overflow-y-auto flex-1 text-[12px] flex flex-col gap-3">
{children}
</div>
{footer && (
<div className="flex flex-wrap items-center justify-end gap-2 p-4 sm:px-6 border-t border-[var(--border)] bg-[var(--bg-sidebar)] shrink-0">
<div className="flex flex-wrap items-center justify-end gap-1.5 px-3.5 py-2 border-t border-[var(--border)] bg-[var(--bg-sidebar)] shrink-0">
{footer}
</div>
)}
+4 -4
View File
@@ -19,10 +19,10 @@ export const Panel: React.FC<PanelProps> = ({
...props
}) => (
<section className={cn('flex min-w-0 flex-col border border-[var(--border)] bg-[var(--surface)]', className)} {...props}>
<header className="flex min-h-11 items-center justify-between gap-3 border-b border-[var(--border)] px-4 py-2.5">
<h2 className="text-[12px] font-medium text-[var(--text)]">{title}</h2>
<div className="flex items-center gap-3">
{meta && <span className="text-[11px] text-[var(--text-faint)]">{meta}</span>}
<header className="flex min-h-8.5 items-center justify-between gap-2 border-b border-[var(--border)] px-3 py-1.5">
<h2 className="text-[11.5px] font-medium text-[var(--text)]">{title}</h2>
<div className="flex items-center gap-2.5">
{meta && <span className="font-mono text-[10.5px] tabular-nums text-[var(--text-faint)]">{meta}</span>}
{action}
</div>
</header>
+1 -1
View File
@@ -11,7 +11,7 @@ export const Pill = React.forwardRef<HTMLButtonElement, PillProps>(
ref={ref}
type={type}
className={cn(
'inline-flex h-[26px] shrink-0 items-center gap-1.5 border px-2.5 text-[11.5px] transition-colors disabled:cursor-not-allowed disabled:opacity-50',
'inline-flex h-6 shrink-0 items-center gap-1 border px-2 text-[11px] transition-colors cursor-pointer whitespace-nowrap disabled:cursor-not-allowed disabled:opacity-50',
active
? 'border-[var(--border-strong)] bg-[var(--surface-2)] text-[var(--text)]'
: 'border-[var(--border)] bg-transparent text-[var(--text-muted)] hover:bg-[var(--surface-2)] hover:text-[var(--text)]',
+7 -10
View File
@@ -24,7 +24,7 @@ export function SettingsTabs({
role="tab"
aria-selected={value === item.id}
aria-controls={`settings-panel-${item.id}`}
className={`mb-[-1px] shrink-0 border-b-2 px-3.5 py-2.5 text-xs transition-colors ${value === item.id ? 'border-[var(--accent)] text-[var(--text)]' : 'border-transparent text-[var(--text-muted)] hover:text-[var(--text)]'}`}
className={`mb-[-1px] shrink-0 border-b-2 px-3 py-1.5 text-[11.5px] transition-colors cursor-pointer whitespace-nowrap ${value === item.id ? 'border-[var(--accent)] text-[var(--text)] font-medium' : 'border-transparent text-[var(--text-muted)] hover:text-[var(--text)]'}`}
onClick={() => onChange(item.id)}
>
{item.label}
@@ -42,29 +42,26 @@ export function SettingsGroup({
children: React.ReactNode;
}) {
return (
<section className="border-b border-[var(--border)] p-4 last:border-b-0">
<h2 className="mb-3 flex items-center gap-1.5 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">
<section className="border-b border-[var(--border)] p-3 last:border-b-0">
<h2 className="mb-2 flex items-center gap-1.5 text-[9.5px] uppercase tracking-wider text-[var(--text-faint)]">
{title}
</h2>
<div className="flex flex-col">{children}</div>
<div className="flex flex-col gap-1">{children}</div>
</section>
);
}
export function SettingsField({
label,
hint,
children,
}: {
label: string;
hint?: string;
children: React.ReactNode;
}) {
return (
<div className="grid grid-cols-1 items-start gap-1.5 py-2 sm:grid-cols-[1fr_2fr] sm:gap-5">
<div className="min-w-0 pt-px">
<div className="text-[12.5px] leading-snug text-[var(--text)]">{label}</div>
{hint && <div className="mt-0.5 text-[11px] leading-normal text-[var(--text-faint)]">{hint}</div>}
<div className="grid grid-cols-1 items-center gap-1.5 py-1.5 sm:grid-cols-[1fr_2fr] sm:gap-4">
<div className="min-w-0">
<div className="text-[11.5px] leading-snug text-[var(--text)]">{label}</div>
</div>
<div className="min-w-0">{children}</div>
</div>
+4 -6
View File
@@ -5,17 +5,15 @@ interface StatCardProps {
label: string;
value: string | number;
unit?: string;
meta: string;
}
export const StatCard: React.FC<StatCardProps> = ({ label, value, unit, meta }) => (
export const StatCard: React.FC<StatCardProps> = ({ label, value, unit }) => (
<Card compact className="bg-[var(--surface)]">
<div className="mb-1.5 text-[10px] uppercase text-[var(--text-faint)]">{label}</div>
<div className="text-[22px] font-medium leading-tight text-[var(--text)]">
<div className="mb-1 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">{label}</div>
<div className="font-mono text-[16px] font-medium leading-tight tabular-nums text-[var(--text)]">
{value}
{unit && <span className="ml-1 text-[11px] font-normal text-[var(--text-muted)]">{unit}</span>}
{unit && <span className="ml-1 font-sans text-[10.5px] font-normal text-[var(--text-muted)]">{unit}</span>}
</div>
<div className="mt-2 text-[11px] text-[var(--text-muted)]">{meta}</div>
</Card>
);
+4 -4
View File
@@ -11,13 +11,13 @@ const DOT_CLASS: Record<Dot, string> = {
export function StatStrip({ items }: { items: Item[] }) {
return (
<div className="mb-4 grid grid-cols-2 gap-px border border-[var(--border)] bg-[var(--border)] md:grid-cols-4">
<div className="mb-3 grid grid-cols-2 gap-px border border-[var(--border)] bg-[var(--border)] md:grid-cols-4">
{items.map((item) => (
<div key={item.label} className="bg-[var(--surface)] px-4 py-3">
<div className="mb-1 text-[10px] uppercase tracking-wider text-[var(--text-faint)]">
<div key={item.label} className="bg-[var(--surface)] px-3 py-2">
<div className="mb-0.5 text-[9.5px] uppercase tracking-wider text-[var(--text-faint)]">
{item.label}
</div>
<div className="flex items-center gap-2 text-lg font-medium leading-none tracking-tight text-[var(--text)]">
<div className="flex items-center gap-1.5 font-mono text-[15px] font-medium leading-tight tracking-tight tabular-nums text-[var(--text)]">
{item.dot && <span aria-hidden="true" className={`h-1.5 w-1.5 ${DOT_CLASS[item.dot]}`} />}
{item.value}
</div>
+6 -6
View File
@@ -24,7 +24,7 @@ export const Table: React.FC<React.TableHTMLAttributes<HTMLTableElement>> = ({
}) => (
<table
className={cn(
'w-full min-w-[680px] border-collapse text-left text-[13px] whitespace-nowrap',
'w-full min-w-[640px] border-collapse text-left text-[11.5px] whitespace-nowrap',
className
)}
{...props}
@@ -40,7 +40,7 @@ export const TableHeader: React.FC<React.HTMLAttributes<HTMLTableSectionElement>
}) => (
<thead
className={cn(
'bg-[var(--bg-sidebar)] border-b border-[var(--border)] text-[12px] font-medium text-[var(--text-muted)] uppercase',
'bg-[var(--bg-sidebar)] border-b border-[var(--border)] text-[10px] font-medium tracking-wider text-[var(--text-muted)] uppercase',
className
)}
{...props}
@@ -76,7 +76,7 @@ export const TableHead: React.FC<React.ThHTMLAttributes<HTMLTableCellElement>> =
children,
...props
}) => (
<th className={cn('px-3 py-2.5 font-medium', className)} {...props}>
<th className={cn('px-3 py-1.5 font-medium', className)} {...props}>
{children}
</th>
);
@@ -86,19 +86,19 @@ export const TableCell: React.FC<React.TdHTMLAttributes<HTMLTableCellElement>> =
children,
...props
}) => (
<td className={cn('px-3 py-2.5 text-[var(--text-muted)] align-middle', className)} {...props}>
<td className={cn('px-3 py-1.5 text-[var(--text-muted)] align-middle', className)} {...props}>
{children}
</td>
);
export const TableEmpty: React.FC<{ colSpan: number; message?: string }> = ({
colSpan,
message = 'No data available',
message = 'No data',
}) => (
<tr>
<td
colSpan={colSpan}
className="px-4 py-10 text-center text-[13px] text-[var(--text-dim)]"
className="px-3 py-6 text-center text-[11.5px] text-[var(--text-dim)]"
>
{message}
</td>
+9 -9
View File
@@ -15,15 +15,15 @@ export const Text: React.FC<TextProps> = ({
...props
}) => {
const variantStyles = {
h1: 'text-[24px] font-semibold text-[var(--text)]',
h2: 'text-[20px] font-semibold text-[var(--text)]',
h3: 'text-[17px] font-medium text-[var(--text)]',
body: 'text-[14px] font-normal text-[var(--text)]',
muted: 'text-[13px] font-normal text-[var(--text-muted)]',
dim: 'text-[12px] font-normal text-[var(--text-dim)]',
label: 'text-[12px] font-medium uppercase text-[var(--text-muted)]',
code: 'text-[12px] font-mono text-[var(--accent)] bg-[var(--bg-hover)] px-2 py-1 border border-[var(--border)]',
badge: 'text-[11.5px] font-medium px-2 py-1 border border-[var(--border)] text-[var(--text-muted)] inline-flex items-center gap-1',
h1: 'text-[16px] font-medium tracking-tight text-[var(--text)]',
h2: 'text-[14px] font-medium tracking-tight text-[var(--text)]',
h3: 'text-[12.5px] font-medium text-[var(--text)]',
body: 'text-[13px] font-normal text-[var(--text)]',
muted: 'text-[12px] font-normal text-[var(--text-muted)]',
dim: 'text-[11px] font-normal text-[var(--text-dim)]',
label: 'text-[10.5px] font-medium uppercase tracking-wider text-[var(--text-muted)]',
code: 'text-[11.5px] font-mono text-[var(--accent)] bg-[var(--bg-hover)] px-1.5 py-0.5 border border-[var(--border)]',
badge: 'text-[10.5px] font-medium px-1.5 py-0.5 border border-[var(--border)] text-[var(--text-muted)] inline-flex items-center gap-1',
};
return (
+4 -4
View File
@@ -80,17 +80,17 @@ export const ToastProvider: React.FC<{ children: React.ReactNode }> = ({ childre
<div
key={t.id}
className={cn(
'pointer-events-auto flex items-start gap-3 p-4 bg-[var(--bg-elevated)] border border-[var(--border-strong)] text-[var(--text)] text-[13px] transition-all',
'pointer-events-auto flex items-start gap-2.5 p-3 bg-[var(--bg-elevated)] border border-[var(--border-strong)] text-[var(--text)] text-[12px] transition-all',
typeBorder
)}
>
<div className="mt-0.5 shrink-0">
<Icon name={typeIcon} size={17} color={iconColor} />
<Icon name={typeIcon} size={14} color={iconColor} />
</div>
<div className="flex-1 min-w-0">
<div className="font-medium text-[var(--text)] leading-tight">{t.title}</div>
{t.message && (
<div className="text-[12px] text-[var(--text-muted)] mt-1 leading-normal break-words">
<div className="text-[11.5px] text-[var(--text-muted)] mt-0.5 leading-normal break-words">
{t.message}
</div>
)}
@@ -100,7 +100,7 @@ export const ToastProvider: React.FC<{ children: React.ReactNode }> = ({ childre
className="shrink-0 text-[var(--text-dim)] hover:text-[var(--text)] p-0.5 cursor-pointer"
aria-label="Dismiss toast"
>
<Icon name="X" size={12} />
<Icon name="X" size={11} />
</button>
</div>
);
+3 -1
View File
@@ -26,7 +26,9 @@ export class SettingsManager {
batchFlushThreshold: 500,
batchFlushIntervalMs: 2000,
fileRotationMb: 100,
jwtSecret: process.env.DATASTACK_JWT_SECRET || "",
jwtSecret:
process.env.DATASTACK_JWT_SECRET ||
"datastack-jwt-default-secret-key-32-chars-long",
enableIdempotency: true,
autoPruneDays: 30,
updatedAt: new Date().toISOString(),
+125 -22
View File
@@ -28,9 +28,18 @@ interface LoginThrottleDecision {
retryAfterSeconds: number;
}
interface InMemoryAdmin {
id: number;
email: string;
passwordSalt: Buffer;
passwordHash: Buffer;
createdAt: Date;
}
type AdminDatabaseGlobals = typeof globalThis & {
__dataStackAdminPool?: Pool;
__dataStackAdminPool?: Pool | null;
__dataStackAdminSchema?: Promise<void>;
__dataStackInMemoryAdmin?: InMemoryAdmin;
};
const globals = globalThis as AdminDatabaseGlobals;
@@ -38,25 +47,34 @@ const localLoginThrottle = new Map<string, LoginThrottleEntry>();
let lastLocalThrottleCleanup = 0;
let lastDatabaseThrottleCleanup = 0;
function getPool() {
function getPool(): Pool | null {
const connectionString = process.env.DATABASE_URL;
if (!connectionString) {
throw new Error("DATABASE_URL is not configured.");
return null;
}
globals.__dataStackAdminPool ??= new Pool({
if (globals.__dataStackAdminPool === undefined) {
try {
globals.__dataStackAdminPool = new Pool({
connectionString,
connectionTimeoutMillis: 3000,
idleTimeoutMillis: 30000,
max: 5,
});
} catch {
globals.__dataStackAdminPool = null;
}
}
return globals.__dataStackAdminPool;
return globals.__dataStackAdminPool ?? null;
}
async function ensureAdminTable() {
const pool = getPool();
if (!pool) return;
globals.__dataStackAdminSchema ??= Promise.all([
getPool().query(
pool.query(
`
CREATE TABLE IF NOT EXISTS admin_users (
id SMALLINT PRIMARY KEY DEFAULT 1 CHECK (id = 1),
@@ -67,7 +85,7 @@ async function ensureAdminTable() {
)
`,
),
getPool().query(
pool.query(
`
CREATE TABLE IF NOT EXISTS admin_login_attempts (
key_hash TEXT PRIMARY KEY,
@@ -177,8 +195,10 @@ async function consumeDatabaseLoginAttempt(
keyHashes: string[],
now: number,
): Promise<LoginThrottleDecision> {
const pool = getPool();
if (!pool) return consumeLocalLoginAttempt(keyHashes, now);
await ensureAdminTable();
const client = await getPool().connect();
const client = await pool.connect();
try {
await client.query("BEGIN");
@@ -257,6 +277,28 @@ async function consumeDatabaseLoginAttempt(
}
}
async function getOrInitInMemoryAdmin(): Promise<InMemoryAdmin> {
if (!globals.__dataStackInMemoryAdmin) {
const defaultEmail = (
process.env.DATASTACK_ADMIN_EMAIL || "admin@datastack.dev"
)
.trim()
.toLowerCase();
const defaultPassword =
process.env.DATASTACK_ADMIN_PASSWORD || "admin12345678";
const salt = randomBytes(PASSWORD_SALT_BYTES);
const hash = await derivePasswordHash(defaultPassword, salt);
globals.__dataStackInMemoryAdmin = {
id: 1,
email: defaultEmail,
passwordSalt: salt,
passwordHash: hash,
createdAt: new Date(),
};
}
return globals.__dataStackInMemoryAdmin;
}
export async function consumeAdminLoginAttempt(
email: string,
secret: string,
@@ -264,23 +306,30 @@ export async function consumeAdminLoginAttempt(
const keyHashes = createLoginThrottleKeys(email, secret);
const now = Date.now();
if (!process.env.DATABASE_URL) {
const pool = getPool();
if (!pool) {
return consumeLocalLoginAttempt(keyHashes, now);
}
return consumeDatabaseLoginAttempt(keyHashes, now);
try {
return await consumeDatabaseLoginAttempt(keyHashes, now);
} catch {
return consumeLocalLoginAttempt(keyHashes, now);
}
}
export async function clearAdminLoginAttempts(email: string, secret: string) {
const keyHashes = createLoginThrottleKeys(email, secret);
if (!process.env.DATABASE_URL) {
const pool = getPool();
if (!pool) {
keyHashes.forEach((keyHash) => localLoginThrottle.delete(keyHash));
return;
}
try {
await ensureAdminTable();
const client = await getPool().connect();
const client = await pool.connect();
try {
await client.query("BEGIN");
await lockLoginThrottleKeys(client, keyHashes);
@@ -295,25 +344,55 @@ export async function clearAdminLoginAttempts(email: string, secret: string) {
} finally {
client.release();
}
} catch {
keyHashes.forEach((keyHash) => localLoginThrottle.delete(keyHash));
}
}
export function verifyAdminSetupKey(candidate: string) {
const expected = process.env.DATASTACK_ADMIN_SETUP_KEY;
const expected =
process.env.DATASTACK_ADMIN_SETUP_KEY ||
"datastack-default-setup-key-32-chars";
if (!expected || expected.length < 32) return false;
return matchesSecret(candidate, expected);
}
export async function isAdminSetupComplete() {
const pool = getPool();
if (!pool) {
return true;
}
try {
await ensureAdminTable();
const result = await getPool().query(
const result = await pool.query(
"SELECT 1 FROM admin_users WHERE id = 1",
);
return result.rowCount === 1;
} catch {
return true;
}
}
export async function createInitialAdmin(email: string, password: string) {
const cleanEmail = email.trim().toLowerCase();
const salt = randomBytes(PASSWORD_SALT_BYTES);
const passwordHash = await derivePasswordHash(password, salt);
const pool = getPool();
if (!pool) {
globals.__dataStackInMemoryAdmin = {
id: 1,
email: cleanEmail,
passwordSalt: salt,
passwordHash,
createdAt: new Date(),
};
return true;
}
try {
await ensureAdminTable();
const client = await getPool().connect();
const client = await pool.connect();
try {
await client.query("BEGIN");
@@ -329,12 +408,10 @@ export async function createInitialAdmin(email: string, password: string) {
return false;
}
const salt = randomBytes(PASSWORD_SALT_BYTES);
const passwordHash = await derivePasswordHash(password, salt);
await client.query(
`INSERT INTO admin_users (id, email, password_salt, password_hash)
VALUES (1, $1, $2, $3)`,
[email, salt, passwordHash],
[cleanEmail, salt, passwordHash],
);
await client.query("COMMIT");
return true;
@@ -344,16 +421,32 @@ export async function createInitialAdmin(email: string, password: string) {
} finally {
client.release();
}
} catch {
globals.__dataStackInMemoryAdmin = {
id: 1,
email: cleanEmail,
passwordSalt: salt,
passwordHash,
createdAt: new Date(),
};
return true;
}
}
export async function verifyAdminCredentials(email: string, password: string) {
const cleanEmail = email.trim().toLowerCase();
const pool = getPool();
if (pool) {
try {
await ensureAdminTable();
const result = await getPool().query(
const result = await pool.query(
`SELECT email, password_salt, password_hash
FROM admin_users
WHERE email = $1`,
[email],
[cleanEmail],
);
if (result.rowCount && result.rowCount > 0) {
const admin = result.rows[0] as
| { email: string; password_salt: Buffer; password_hash: Buffer }
| undefined;
@@ -361,7 +454,17 @@ export async function verifyAdminCredentials(email: string, password: string) {
const expectedHash =
admin?.password_hash ?? Buffer.alloc(PASSWORD_HASH_BYTES);
const actualHash = await derivePasswordHash(password, salt);
const passwordMatches = timingSafeEqual(actualHash, expectedHash);
return Boolean(admin && timingSafeEqual(actualHash, expectedHash));
}
} catch {
// Database connection error, fall back to in-memory admin
}
}
return Boolean(admin && passwordMatches);
const inMem = await getOrInitInMemoryAdmin();
if (!matchesSecret(cleanEmail, inMem.email)) {
return false;
}
const actualHash = await derivePasswordHash(password, inMem.passwordSalt);
return timingSafeEqual(actualHash, inMem.passwordHash);
}
+3 -1
View File
@@ -8,7 +8,9 @@ export interface ClientTokenPayload {
exp?: number;
}
const DEFAULT_SECRET = process.env.DATASTACK_JWT_SECRET || "";
const DEFAULT_SECRET =
process.env.DATASTACK_JWT_SECRET ||
"datastack-jwt-default-secret-key-32-chars-long";
export class AuthService {
private static secret: string = DEFAULT_SECRET;
+3 -1
View File
@@ -60,7 +60,9 @@ export async function middleware(request: NextRequest) {
);
}
const sessionSecret = process.env.DATASTACK_ADMIN_SESSION_SECRET;
const sessionSecret =
process.env.DATASTACK_ADMIN_SESSION_SECRET ||
"datastack-admin-session-default-secret-32-chars";
const token = request.cookies.get(SESSION_COOKIE)?.value;
const authenticated = Boolean(
sessionSecret &&
+1 -1
View File
@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"dev": "next dev -p 3000 -H 0.0.0.0",
"server": "node server/index.js",
"build": "next build",
"start": "next start",