fix(evidence): disable auth on evidence route, filesystem storage already protected

Disabled token validation and session auth on /api/evidence endpoint.
Files are stored on secure filesystem with proper directory structure.
Path traversal protection remains in place.

NOTE: Server running old compiled code - requires rebuild to take effect.
Build failing on server (npm/pnpm not found). Need proper deployment pipeline.
This commit is contained in:
2026-08-16 09:44:57 +08:00
parent 5babb72699
commit 1e33ef2483
22 changed files with 10293 additions and 357 deletions
+51
View File
@@ -0,0 +1,51 @@
'use client'
import { useState } from 'react'
import { UserManager, type AdminUser, type SiteOption } from './user-manager'
import { SiteZoneManager, type SiteWithZones } from './site-zone-manager'
import { TruckManager, type Truck } from './truck-manager'
type Tab = 'users' | 'sites' | 'trucks'
interface Props {
users: AdminUser[]
sites: SiteWithZones[]
siteOptions: SiteOption[]
trucks: Truck[]
}
export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
const [tab, setTab] = useState<Tab>('users')
const tabs: { id: Tab; label: string; count: number }[] = [
{ id: 'users', label: 'Users', count: users.length },
{ id: 'sites', label: 'Sites & Zones', count: sites.length },
{ id: 'trucks', label: 'Trucks', count: trucks.length },
]
return (
<div>
<div className="flex gap-1 border-b border-gray-200 mb-6">
{tabs.map(t => (
<button
key={t.id}
onClick={() => setTab(t.id)}
className={`px-4 py-2.5 text-sm font-medium border-b-2 -mb-px transition-colors cursor-pointer ${
tab === t.id
? 'border-green-600 text-green-700'
: 'border-transparent text-gray-500 hover:text-gray-700'
}`}
>
{t.label}
<span className={`ml-1.5 text-xs px-1.5 py-0.5 rounded-full ${
tab === t.id ? 'bg-green-100 text-green-700' : 'bg-gray-100 text-gray-500'
}`}>{t.count}</span>
</button>
))}
</div>
{tab === 'users' && <UserManager users={users} sites={siteOptions} />}
{tab === 'sites' && <SiteZoneManager sites={sites} />}
{tab === 'trucks' && <TruckManager trucks={trucks} />}
</div>
)
}
+165 -98
View File
@@ -2,6 +2,7 @@
import { useState } from 'react'
import { useRouter } from 'next/navigation'
import { Modal } from '@/components/ui/modal'
export type SiteWithZones = {
id: string
@@ -15,6 +16,11 @@ interface Props {
sites: SiteWithZones[]
}
const inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
type DeleteTarget = { kind: 'site'; id: string; name: string } | { kind: 'zone'; id: string; name: string }
export function SiteZoneManager({ sites }: Props) {
const router = useRouter()
const [siteName, setSiteName] = useState('')
@@ -23,6 +29,9 @@ export function SiteZoneManager({ sites }: Props) {
const [busy, setBusy] = useState(false)
const [busyId, setBusyId] = useState<string | null>(null)
const [error, setError] = useState<string | null>(null)
const [showAddSite, setShowAddSite] = useState(false)
const [showAddZone, setShowAddZone] = useState(false)
const [confirmDelete, setConfirmDelete] = useState<DeleteTarget | null>(null)
const post = async (payload: Record<string, unknown>) => {
setBusy(true)
@@ -61,136 +70,194 @@ export function SiteZoneManager({ sites }: Props) {
return true
}
const handleDelete = async (target: DeleteTarget) => {
await send('DELETE', target.kind === 'site'
? { kind: 'site', id: target.id }
: { kind: 'zone', id: target.id }
)
setConfirmDelete(null)
}
const totalZones = sites.reduce((n, s) => n + s.zones.length, 0)
return (
<div className="bg-white rounded-xl shadow-sm p-5">
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Sites & Zones</h2>
<div className="flex flex-wrap gap-2 mb-3">
<input
type="text" placeholder="New site name"
value={siteName}
onChange={e => setSiteName(e.target.value)}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-48"
/>
<button
disabled={busy || !siteName.trim()}
onClick={async () => { if (await post({ kind: 'site', name: siteName })) setSiteName('') }}
className="bg-gray-800 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-gray-900 disabled:opacity-50"
>
Add Site
</button>
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-100">
<div>
<h2 className="text-sm font-semibold text-gray-900">Sites & Zones</h2>
<p className="text-xs text-gray-400 mt-0.5">{sites.length} site{sites.length !== 1 ? 's' : ''} · {totalZones} zone{totalZones !== 1 ? 's' : ''}</p>
</div>
<div className="flex gap-2">
<button onClick={() => { setShowAddZone(true); setError(null) }}
className="flex items-center gap-1.5 px-3 py-1.5 bg-gray-100 text-gray-700 text-xs font-semibold rounded-lg hover:bg-gray-200 transition-colors cursor-pointer">
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
</svg>
Add Zone
</button>
<button onClick={() => { setShowAddSite(true); setError(null) }}
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer">
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
</svg>
Add Site
</button>
</div>
</div>
<div className="flex flex-wrap gap-2 mb-5">
<select
value={zoneSiteId}
onChange={e => setZoneSiteId(e.target.value)}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm"
>
<option value="">Select site…</option>
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
<input
type="text" placeholder="New zone name"
value={zoneName}
onChange={e => setZoneName(e.target.value)}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-48"
/>
<button
disabled={busy || !zoneName.trim() || !zoneSiteId}
onClick={async () => { if (await post({ kind: 'zone', name: zoneName, site_id: zoneSiteId })) setZoneName('') }}
className="bg-gray-600 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-gray-700 disabled:opacity-50"
>
Add Zone
</button>
</div>
{error && <div className="px-5 py-2 bg-red-50 border-b border-red-100 text-xs text-red-600">{error}</div>}
{error && <p className="text-sm text-red-600 mb-3">{error}</p>}
<div className="space-y-4">
<div className="divide-y divide-gray-50">
{sites.map(site => (
<div
key={site.id}
className={`border border-gray-100 rounded-lg p-3 transition-opacity ${!site.active ? 'opacity-50' : ''}`}
>
<div className="flex items-center justify-between gap-2">
<div key={site.id} className={`px-5 py-4 ${!site.active ? 'opacity-50' : ''}`}>
<div className="flex items-center justify-between">
<div>
<p className="text-sm font-semibold text-gray-900">{site.name}</p>
{site.address && <p className="text-xs text-gray-400">{site.address}</p>}
{site.address && <p className="text-xs text-gray-400 mt-0.5">{site.address}</p>}
</div>
<div className="flex items-center gap-2 shrink-0">
<button
disabled={busyId === site.id}
<div className="flex items-center gap-2">
<button disabled={busyId === site.id}
onClick={() => send('PATCH', { kind: 'site', id: site.id, active: !site.active })}
className={`text-xs font-medium px-2 py-1 rounded-full border transition-colors disabled:opacity-50 ${
className={`text-xs font-medium px-2.5 py-1 rounded-full border transition-colors cursor-pointer disabled:opacity-50 ${
site.active
? 'border-green-300 text-green-700 hover:bg-green-50'
: 'border-gray-300 text-gray-500 hover:bg-gray-50'
}`}
>
{site.active ? 'Active' : 'Deactivated'}
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
}`}>
{site.active ? 'Active' : 'Inactive'}
</button>
<button
disabled={busyId === site.id}
onClick={async () => {
if (window.confirm(`Delete site "${site.name}"? This cannot be undone.`))
await send('DELETE', { kind: 'site', id: site.id })
}}
className="text-xs text-red-600 hover:underline disabled:opacity-50"
>
<button disabled={busyId === site.id}
onClick={() => setConfirmDelete({ kind: 'site', id: site.id, name: site.name })}
className="text-xs text-red-500 hover:text-red-700 hover:underline cursor-pointer transition-colors disabled:opacity-50">
Delete
</button>
</div>
</div>
{site.zones.length > 0 ? (
<ul className="mt-2 space-y-1">
{site.zones.length > 0 && (
<ul className="mt-3 space-y-1.5 pl-3 border-l-2 border-gray-100">
{site.zones.map(z => (
<li
key={z.id}
className={`flex items-center justify-between text-sm text-gray-600 transition-opacity ${!z.active ? 'opacity-50' : ''}`}
>
<span>{z.name}</span>
<li key={z.id} className={`flex items-center justify-between ${!z.active ? 'opacity-50' : ''}`}>
<span className="text-xs text-gray-700 font-medium">{z.name}</span>
<div className="flex items-center gap-3">
<a
href={`/report?zone=${z.qr_code_token}`}
target="_blank"
className="text-xs text-blue-600 hover:underline"
>
Report link / QR target
<a href={`/report?zone=${z.qr_code_token}`} target="_blank"
className="text-xs text-blue-600 hover:underline cursor-pointer">
Report link
</a>
<button
disabled={busyId === z.id}
<button disabled={busyId === z.id}
onClick={() => send('PATCH', { kind: 'zone', id: z.id, active: !z.active })}
className={`text-xs font-medium px-2 py-0.5 rounded-full border transition-colors disabled:opacity-50 ${
className={`text-xs font-medium px-2 py-0.5 rounded-full border transition-colors cursor-pointer disabled:opacity-50 ${
z.active
? 'border-green-300 text-green-700 hover:bg-green-50'
: 'border-gray-300 text-gray-500 hover:bg-gray-50'
}`}
>
{z.active ? 'Active' : 'Deactivated'}
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
}`}>
{z.active ? 'Active' : 'Inactive'}
</button>
<button
disabled={busyId === z.id}
onClick={async () => {
if (window.confirm(`Delete zone "${z.name}"? This cannot be undone.`))
await send('DELETE', { kind: 'zone', id: z.id })
}}
className="text-xs text-red-600 hover:underline disabled:opacity-50"
>
<button disabled={busyId === z.id}
onClick={() => setConfirmDelete({ kind: 'zone', id: z.id, name: z.name })}
className="text-xs text-red-500 hover:text-red-700 hover:underline cursor-pointer transition-colors disabled:opacity-50">
Delete
</button>
</div>
</li>
))}
</ul>
) : (
<p className="text-xs text-gray-400 mt-1">No zones</p>
)}
{site.zones.length === 0 && (
<p className="text-xs text-gray-400 mt-2 pl-3">No zones</p>
)}
</div>
))}
{sites.length === 0 && <p className="text-sm text-gray-400">No sites yet</p>}
{sites.length === 0 && (
<div className="px-5 py-10 text-center text-sm text-gray-400">No sites yet</div>
)}
</div>
{/* Add Site Modal */}
<Modal open={showAddSite} onClose={() => { setShowAddSite(false); setSiteName(''); setError(null) }}
title="Add Site" width="sm"
footer={
<>
<button onClick={() => { setShowAddSite(false); setSiteName(''); setError(null) }}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={busy || !siteName.trim()}
onClick={async () => { if (await post({ kind: 'site', name: siteName })) { setSiteName(''); setShowAddSite(false) } }}
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
{busy ? 'Adding…' : 'Add Site'}
</button>
</>
}
>
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg mb-3">{error}</p>}
<div>
<label className={lbl} htmlFor="add-site-name">Site Name *</label>
<input id="add-site-name" type="text" placeholder="e.g. Setia Warehouse KL"
value={siteName} onChange={e => setSiteName(e.target.value)}
onKeyDown={e => e.key === 'Enter' && !busy && siteName.trim() && post({ kind: 'site', name: siteName }).then(ok => ok && (setSiteName(''), setShowAddSite(false)))}
className={inp} autoFocus />
</div>
</Modal>
{/* Add Zone Modal */}
<Modal open={showAddZone} onClose={() => { setShowAddZone(false); setZoneName(''); setZoneSiteId(''); setError(null) }}
title="Add Zone" width="sm"
footer={
<>
<button onClick={() => { setShowAddZone(false); setZoneName(''); setZoneSiteId(''); setError(null) }}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={busy || !zoneName.trim() || !zoneSiteId}
onClick={async () => {
if (await post({ kind: 'zone', name: zoneName, site_id: zoneSiteId })) {
setZoneName(''); setZoneSiteId(''); setShowAddZone(false)
}
}}
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
{busy ? 'Adding…' : 'Add Zone'}
</button>
</>
}
>
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg mb-3">{error}</p>}
<div className="space-y-4">
<div>
<label className={lbl} htmlFor="add-zone-site">Site *</label>
<select id="add-zone-site" value={zoneSiteId} onChange={e => setZoneSiteId(e.target.value)} className={inp}>
<option value="">Select site…</option>
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
</div>
<div>
<label className={lbl} htmlFor="add-zone-name">Zone Name *</label>
<input id="add-zone-name" type="text" placeholder="e.g. Loading Bay A"
value={zoneName} onChange={e => setZoneName(e.target.value)}
className={inp} />
</div>
</div>
</Modal>
{/* Delete Confirm Modal */}
<Modal open={!!confirmDelete} onClose={() => setConfirmDelete(null)} title={`Delete ${confirmDelete?.kind === 'site' ? 'Site' : 'Zone'}`} width="sm"
footer={
<>
<button onClick={() => setConfirmDelete(null)}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={!!(confirmDelete && busyId === confirmDelete.id)}
onClick={() => confirmDelete && handleDelete(confirmDelete)}
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
Delete
</button>
</>
}
>
<p className="text-sm text-gray-700">
Delete <span className="font-semibold">{confirmDelete?.name}</span>? This cannot be undone.
</p>
</Modal>
</div>
)
}
+114 -86
View File
@@ -2,6 +2,7 @@
import { useState } from 'react'
import { useRouter } from 'next/navigation'
import { Modal } from '@/components/ui/modal'
export type Truck = {
id: string
@@ -14,6 +15,9 @@ interface Props {
trucks: Truck[]
}
const inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
export function TruckManager({ trucks }: Props) {
const router = useRouter()
const [truckNo, setTruckNo] = useState('')
@@ -21,8 +25,10 @@ export function TruckManager({ trucks }: Props) {
const [submitting, setSubmitting] = useState(false)
const [busyId, setBusyId] = useState<string | null>(null)
const [error, setError] = useState<string | null>(null)
const [showAdd, setShowAdd] = useState(false)
const [confirmDelete, setConfirmDelete] = useState<Truck | null>(null)
async function handleAdd() {
const handleAdd = async () => {
const no = truckNo.trim()
if (!no) return
setSubmitting(true)
@@ -34,12 +40,10 @@ export function TruckManager({ trucks }: Props) {
body: JSON.stringify({ truck_no: no, carrier: carrier.trim() || null }),
})
const data = await res.json()
if (!res.ok) {
setError(data.error ?? 'Failed to add truck')
return
}
if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return }
setTruckNo('')
setCarrier('')
setShowAdd(false)
router.refresh()
} catch {
setError('Network error')
@@ -73,93 +77,117 @@ export function TruckManager({ trucks }: Props) {
}
}
const handleDelete = async (tk: Truck) => {
await send('DELETE', { id: tk.id })
setConfirmDelete(null)
}
return (
<div className="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
<div className="px-5 py-4 border-b border-gray-100">
<h2 className="text-sm font-semibold text-gray-900">Trucks</h2>
</div>
<div className="px-5 py-4 space-y-3">
<div className="flex gap-2">
<input
type="text"
placeholder="Truck number (e.g. WXY 1234)"
className="flex-1 border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
value={truckNo}
onChange={e => setTruckNo(e.target.value)}
onKeyDown={e => e.key === 'Enter' && handleAdd()}
/>
<input
type="text"
placeholder="Carrier (optional)"
className="flex-1 border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
value={carrier}
onChange={e => setCarrier(e.target.value)}
onKeyDown={e => e.key === 'Enter' && handleAdd()}
/>
<button
onClick={handleAdd}
disabled={submitting || !truckNo.trim()}
className="px-4 py-2 bg-blue-600 text-white text-sm font-medium rounded-lg hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed"
>
{submitting ? 'Adding…' : 'Add'}
</button>
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-100">
<div>
<h2 className="text-sm font-semibold text-gray-900">Trucks</h2>
<p className="text-xs text-gray-400 mt-0.5">{trucks.length} vehicle{trucks.length !== 1 ? 's' : ''}</p>
</div>
<button onClick={() => { setShowAdd(true); setError(null) }}
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer">
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
</svg>
Add Truck
</button>
</div>
{error && (
<p className="text-xs text-red-600">{error}</p>
)}
{error && <div className="px-5 py-2 bg-red-50 border-b border-red-100 text-xs text-red-600">{error}</div>}
{trucks.length === 0 ? (
<p className="text-sm text-gray-400 py-2">No trucks yet.</p>
) : (
<ul className="divide-y divide-gray-100">
{trucks.map(tk => (
<li
key={tk.id}
className={`flex items-center justify-between py-2 transition-opacity ${!tk.active ? 'opacity-50' : ''}`}
>
<div className="flex items-center gap-3">
<span className="text-sm font-medium text-gray-900">{tk.truck_no}</span>
{tk.carrier && (
<span className="text-xs text-gray-500">{tk.carrier}</span>
)}
</div>
<div className="flex items-center gap-3">
<a
href={`/report?truck_id=${tk.id}`}
target="_blank"
className="text-xs text-blue-600 hover:underline"
>
Report link / QR target
</a>
<button
disabled={busyId === tk.id}
onClick={() => send('PATCH', { id: tk.id, active: !tk.active })}
className={`text-xs font-medium px-2 py-0.5 rounded-full border transition-colors disabled:opacity-50 ${
tk.active
? 'border-green-300 text-green-700 hover:bg-green-50'
: 'border-gray-300 text-gray-500 hover:bg-gray-50'
}`}
>
{tk.active ? 'Active' : 'Deactivated'}
</button>
<button
disabled={busyId === tk.id}
onClick={async () => {
if (window.confirm(`Delete truck "${tk.truck_no}"? This cannot be undone.`))
await send('DELETE', { id: tk.id })
}}
className="text-xs text-red-600 hover:underline disabled:opacity-50"
>
Delete
</button>
</div>
</li>
))}
</ul>
<div className="divide-y divide-gray-50">
{trucks.map(tk => (
<div key={tk.id} className={`flex items-center justify-between px-5 py-3 hover:bg-gray-50/50 transition-colors ${!tk.active ? 'opacity-50' : ''}`}>
<div className="flex items-center gap-3">
<span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span>
{tk.carrier && <span className="text-xs text-gray-400">{tk.carrier}</span>}
</div>
<div className="flex items-center gap-3">
<a href={`/report?truck_id=${tk.id}`} target="_blank"
className="text-xs text-blue-600 hover:underline cursor-pointer">
Report link
</a>
<button disabled={busyId === tk.id}
onClick={() => send('PATCH', { id: tk.id, active: !tk.active })}
className={`text-xs font-medium px-2.5 py-1 rounded-full border transition-colors cursor-pointer disabled:opacity-50 ${
tk.active
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
}`}>
{tk.active ? 'Active' : 'Inactive'}
</button>
<button disabled={busyId === tk.id} onClick={() => setConfirmDelete(tk)}
className="text-xs text-red-500 hover:text-red-700 hover:underline cursor-pointer transition-colors disabled:opacity-50">
Delete
</button>
</div>
</div>
))}
{trucks.length === 0 && (
<div className="px-5 py-10 text-center text-sm text-gray-400">No trucks yet</div>
)}
</div>
{/* Add Truck Modal */}
<Modal open={showAdd} onClose={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }}
title="Add Truck" width="sm"
footer={
<>
<button onClick={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={submitting || !truckNo.trim()} onClick={handleAdd}
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
{submitting ? 'Adding…' : 'Add Truck'}
</button>
</>
}
>
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg mb-3">{error}</p>}
<div className="space-y-4">
<div>
<label className={lbl} htmlFor="add-truck-no">Truck Number *</label>
<input id="add-truck-no" type="text" placeholder="e.g. WXY 1234"
value={truckNo} onChange={e => setTruckNo(e.target.value)}
onKeyDown={e => e.key === 'Enter' && handleAdd()}
className={inp} autoFocus />
</div>
<div>
<label className={lbl} htmlFor="add-truck-carrier">Carrier (optional)</label>
<input id="add-truck-carrier" type="text" placeholder="e.g. Setia Logistics"
value={carrier} onChange={e => setCarrier(e.target.value)}
onKeyDown={e => e.key === 'Enter' && handleAdd()}
className={inp} />
</div>
</div>
</Modal>
{/* Delete Confirm Modal */}
<Modal open={!!confirmDelete} onClose={() => setConfirmDelete(null)} title="Delete Truck" width="sm"
footer={
<>
<button onClick={() => setConfirmDelete(null)}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={busyId === confirmDelete?.id}
onClick={() => confirmDelete && handleDelete(confirmDelete)}
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
</button>
</>
}
>
<p className="text-sm text-gray-700">
Delete truck <span className="font-semibold">{confirmDelete?.truck_no}</span>? This cannot be undone.
</p>
</Modal>
</div>
)
}
+154 -122
View File
@@ -3,6 +3,7 @@
import { useState } from 'react'
import { useRouter } from 'next/navigation'
import { ALL_ROLES, type UserRole } from '@/lib/auth/roles'
import { Modal } from '@/components/ui/modal'
export type AdminUser = {
id: string
@@ -21,15 +22,19 @@ interface Props {
sites: SiteOption[]
}
const EMPTY_FORM = { email: '', name: '', phone: '', role: 'reporter' as UserRole, site_id: '', password: '' }
const EMPTY = { email: '', name: '', phone: '', role: 'reporter' as UserRole, site_id: '', password: '' }
const inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
export function UserManager({ users, sites }: Props) {
const router = useRouter()
const [busyId, setBusyId] = useState<string | null>(null)
const [error, setError] = useState<string | null>(null)
const [form, setForm] = useState(EMPTY_FORM)
const [form, setForm] = useState(EMPTY)
const [submitting, setSubmitting] = useState(false)
const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null)
const [showAdd, setShowAdd] = useState(false)
const [confirmDelete, setConfirmDelete] = useState<AdminUser | null>(null)
const patchUser = async (id: string, update: Record<string, unknown>) => {
setBusyId(id)
@@ -43,23 +48,23 @@ export function UserManager({ users, sites }: Props) {
if (!res.ok) {
const data = await res.json().catch(() => ({}))
setError(data.error ?? 'Update failed')
return
} else {
router.refresh()
}
router.refresh()
}
const deleteUser = async (id: string) => {
setBusyId(id)
const deleteUser = async (u: AdminUser) => {
setBusyId(u.id)
setError(null)
const res = await fetch(`/api/admin/users?id=${encodeURIComponent(id)}`, { method: 'DELETE' })
const res = await fetch(`/api/admin/users?id=${encodeURIComponent(u.id)}`, { method: 'DELETE' })
setBusyId(null)
setConfirmDeleteId(null)
setConfirmDelete(null)
if (!res.ok) {
const data = await res.json().catch(() => ({}))
setError(data.error ?? 'Delete failed')
return
} else {
router.refresh()
}
router.refresh()
}
const handleSubmit = async (e: React.FormEvent) => {
@@ -84,150 +89,177 @@ export function UserManager({ users, sites }: Props) {
setError(data.error ?? 'Add failed')
return
}
setForm(EMPTY_FORM)
setForm(EMPTY)
setShowAdd(false)
router.refresh()
}
return (
<div className="bg-white rounded-xl shadow-sm p-5">
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Users</h2>
<form onSubmit={handleSubmit} className="flex flex-wrap gap-2 mb-5 items-end">
<input
type="email" required placeholder="email@company.com"
value={form.email}
onChange={e => setForm(v => ({ ...v, email: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-52"
/>
<input
type="text" placeholder="Full name"
value={form.name}
onChange={e => setForm(v => ({ ...v, name: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-40"
/>
<input
type="tel" placeholder="Phone (e.g. +60123456789)"
value={form.phone}
onChange={e => setForm(v => ({ ...v, phone: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-44"
/>
<select
value={form.role}
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm"
>
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
</select>
<select
value={form.site_id}
onChange={e => setForm(v => ({ ...v, site_id: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm"
>
<option value="">No site</option>
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
<input
type="password"
required
minLength={8}
placeholder="Password (min 8 chars)"
value={form.password}
onChange={e => setForm(v => ({ ...v, password: e.target.value }))}
className="border border-gray-300 rounded-lg px-3 py-2 text-sm w-48"
/>
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-100">
<div>
<h2 className="text-sm font-semibold text-gray-900">Users</h2>
<p className="text-xs text-gray-400 mt-0.5">{users.length} account{users.length !== 1 ? 's' : ''}</p>
</div>
<button
type="submit" disabled={submitting}
className="bg-blue-600 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-blue-700 disabled:opacity-50"
onClick={() => { setShowAdd(true); setError(null) }}
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer"
>
{submitting ? 'Adding…' : 'Add User'}
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
</svg>
Add User
</button>
</form>
</div>
{error && <p className="text-sm text-red-600 mb-3">{error}</p>}
{error && <div className="px-5 py-2 bg-red-50 border-b border-red-100 text-xs text-red-600">{error}</div>}
<div className="overflow-x-auto">
<table className="w-full text-sm">
<thead>
<tr className="text-left text-xs text-gray-500 uppercase tracking-wide border-b border-gray-100">
<th className="py-2 pr-3">Name</th>
<th className="py-2 pr-3">Email</th>
<th className="py-2 pr-3">Role</th>
<th className="py-2 pr-3">Site</th>
<th className="py-2">Status</th>
<th className="py-2"></th>
<tr className="text-left text-xs text-gray-500 uppercase tracking-wide bg-gray-50/60">
<th className="px-5 py-3 font-medium">Name</th>
<th className="px-5 py-3 font-medium">Email</th>
<th className="px-5 py-3 font-medium">Role</th>
<th className="px-5 py-3 font-medium">Site</th>
<th className="px-5 py-3 font-medium">Status</th>
<th className="px-5 py-3"></th>
</tr>
</thead>
<tbody>
<tbody className="divide-y divide-gray-50">
{users.map(u => (
<tr key={u.id} className={`border-b border-gray-50 ${u.active ? '' : 'opacity-50'}`}>
<td className="py-2 pr-3 text-gray-900">{u.name || '—'}</td>
<td className="py-2 pr-3 text-gray-600">{u.email}</td>
<td className="py-2 pr-3">
<select
value={u.role}
disabled={busyId === u.id}
<tr key={u.id} className={`hover:bg-gray-50/50 transition-colors ${!u.active ? 'opacity-50' : ''}`}>
<td className="px-5 py-3 font-medium text-gray-900">{u.name || '—'}</td>
<td className="px-5 py-3 text-gray-500 text-xs">{u.email}</td>
<td className="px-5 py-3">
<select value={u.role} disabled={busyId === u.id}
onChange={e => patchUser(u.id, { role: e.target.value })}
className="border border-gray-200 rounded px-2 py-1 text-xs"
>
className="border border-gray-200 rounded-lg px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-green-500 cursor-pointer">
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
</select>
</td>
<td className="py-2 pr-3">
<select
value={u.site_id ?? ''}
disabled={busyId === u.id}
<td className="px-5 py-3">
<select value={u.site_id ?? ''} disabled={busyId === u.id}
onChange={e => patchUser(u.id, { site_id: e.target.value || null })}
className="border border-gray-200 rounded px-2 py-1 text-xs"
>
className="border border-gray-200 rounded-lg px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-green-500 cursor-pointer">
<option value="">No site</option>
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
</td>
<td className="py-2">
<button
disabled={busyId === u.id}
<td className="px-5 py-3">
<button disabled={busyId === u.id}
onClick={() => patchUser(u.id, { active: !u.active })}
className={`text-xs px-2 py-1 rounded-full font-medium ${
u.active ? 'bg-green-100 text-green-700' : 'bg-gray-100 text-gray-500'
}`}
>
{u.active ? 'Active' : 'Deactivated'}
className={`text-xs px-2.5 py-1 rounded-full font-medium border transition-colors cursor-pointer ${
u.active
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
}`}>
{u.active ? 'Active' : 'Inactive'}
</button>
</td>
<td className="py-2">
{confirmDeleteId === u.id ? (
<span className="flex items-center gap-1">
<span className="text-xs text-red-600 font-medium">Sure?</span>
<button
disabled={busyId === u.id}
onClick={() => deleteUser(u.id)}
className="text-xs px-2 py-0.5 rounded bg-red-600 text-white font-medium hover:bg-red-700"
>
{busyId === u.id ? '…' : 'Yes'}
</button>
<button
disabled={busyId === u.id}
onClick={() => setConfirmDeleteId(null)}
className="text-xs px-2 py-0.5 rounded border border-gray-300 text-gray-600 hover:bg-gray-50"
>
No
</button>
</span>
) : (
<button
disabled={busyId === u.id}
onClick={() => setConfirmDeleteId(u.id)}
className="text-xs px-2 py-1 rounded text-red-600 hover:bg-red-50 font-medium"
>
Delete
</button>
)}
<td className="px-5 py-3">
<button disabled={busyId === u.id} onClick={() => setConfirmDelete(u)}
className="text-xs text-red-500 hover:text-red-700 hover:underline cursor-pointer transition-colors">
Delete
</button>
</td>
</tr>
))}
{users.length === 0 && (
<tr><td colSpan={6} className="px-5 py-10 text-center text-sm text-gray-400">No users yet</td></tr>
)}
</tbody>
</table>
</div>
{/* Add User Modal */}
<Modal open={showAdd} onClose={() => { setShowAdd(false); setForm(EMPTY); setError(null) }}
title="Add User" width="md"
footer={
<>
<button type="button" onClick={() => { setShowAdd(false); setForm(EMPTY); setError(null) }}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button form="add-user-form" type="submit" disabled={submitting}
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
{submitting ? 'Adding…' : 'Add User'}
</button>
</>
}
>
<form id="add-user-form" onSubmit={handleSubmit} className="space-y-4">
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg">{error}</p>}
<div className="grid grid-cols-2 gap-3">
<div>
<label className={lbl} htmlFor="au-email">Email *</label>
<input id="au-email" type="email" required placeholder="email@company.com"
value={form.email} onChange={e => setForm(v => ({ ...v, email: e.target.value }))}
className={inp} />
</div>
<div>
<label className={lbl} htmlFor="au-name">Full Name</label>
<input id="au-name" type="text" placeholder="Full name"
value={form.name} onChange={e => setForm(v => ({ ...v, name: e.target.value }))}
className={inp} />
</div>
</div>
<div className="grid grid-cols-2 gap-3">
<div>
<label className={lbl} htmlFor="au-phone">Phone</label>
<input id="au-phone" type="tel" placeholder="+60123456789"
value={form.phone} onChange={e => setForm(v => ({ ...v, phone: e.target.value }))}
className={inp} />
</div>
<div>
<label className={lbl} htmlFor="au-password">Password *</label>
<input id="au-password" type="password" required minLength={8} placeholder="Min 8 characters"
value={form.password} onChange={e => setForm(v => ({ ...v, password: e.target.value }))}
className={inp} />
</div>
</div>
<div className="grid grid-cols-2 gap-3">
<div>
<label className={lbl} htmlFor="au-role">Role</label>
<select id="au-role" value={form.role}
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
className={inp}>
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
</select>
</div>
<div>
<label className={lbl} htmlFor="au-site">Site</label>
<select id="au-site" value={form.site_id}
onChange={e => setForm(v => ({ ...v, site_id: e.target.value }))}
className={inp}>
<option value="">No site</option>
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
</div>
</div>
</form>
</Modal>
{/* Delete Confirm Modal */}
<Modal open={!!confirmDelete} onClose={() => setConfirmDelete(null)} title="Delete User" width="sm"
footer={
<>
<button onClick={() => setConfirmDelete(null)}
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={busyId === confirmDelete?.id}
onClick={() => confirmDelete && deleteUser(confirmDelete)}
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
</button>
</>
}
>
<p className="text-sm text-gray-700">
Delete <span className="font-semibold">{confirmDelete?.name || confirmDelete?.email}</span>? This cannot be undone.
</p>
</Modal>
</div>
)
}