69 Commits

Author SHA1 Message Date
e82443ee03 chore: bump version to 0.1.17 2026-05-26 16:28:44 +08:00
501fbde118 fix: perbaiki layout tabel dan accordion di layar sempit
Co-authored-by: amaliadwiy <amaliadwiy@users.noreply.github.com>
2026-05-26 15:11:25 +08:00
fe4ddf686e fix: perbaiki layout tabel User Management agar tidak overflow di layar sempit 2026-05-26 15:00:47 +08:00
fe83fd6025 fix: perbaiki layout accordion header Bug Reports agar badge status selalu terlihat 2026-05-26 14:50:47 +08:00
457f36be06 fix: perbaiki layout filter Activity Logs agar tidak overflow 2026-05-26 14:43:59 +08:00
5002fd1519 fix: perbaiki layout table Recent Error Reports di dashboard
Kolom App, Version, Reported, dan Status tidak lagi wrap atau terpotong.
Tambah horizontal scroll pada container dan minWidth pada table.
2026-05-26 14:37:28 +08:00
8aaec351cf Merge pull request 'amalia/25-mei-26' (#26) from amalia/25-mei-26 into main
Reviewed-on: #26
2026-05-25 17:33:49 +08:00
ed49f2e4d1 chore: bump version to 0.1.16 2026-05-25 15:13:10 +08:00
f368e1d31b feat: bug statistics + village detail dashboard enhancement
- Tambah GET /api/bugs/stats dengan summary cards & chart trend/bugs per app
- Tambah date range picker di village activity chart
- Tambah tabel Recent Activity (action + description) di village detail
- Update API graph-log-villages support dateFrom/dateTo custom range
2026-05-25 15:00:33 +08:00
2921f604a9 chore: tambah .claude/ ke .gitignore 2026-05-25 12:03:19 +08:00
a19846f589 feat: copy full API key on-demand di halaman dev
Sebelumnya copy button mengcopy key yang sudah ter-mask dari list endpoint
Desa+ API. Sekarang klik copy fetch full key via GET /api-keys/:id lalu
salin ke clipboard.
2026-05-25 11:59:54 +08:00
e32addbc85 feat: notifikasi real-time bug baru via WebSocket
- presence.ts: tambah notifSubs (ADMIN+DEVELOPER) dan broadcastNotification
- app.ts: broadcast new_bug event setelah bug dibuat, update WS handler
- usePresence: terima callback onNewBug, expose NewBugPayload type
- DashboardLayout: pasang usePresence, tampilkan Mantine notification saat bug baru masuk
2026-05-25 11:35:21 +08:00
8c33003b17 feat: debounce search, tambah filter source & date range di bug-reports, hapus seafile.ts
- Debounce search input (400ms, min 3 karakter) sesuai konvensi
- Tambah filter source (QC/SYSTEM/USER) dan date range di bug-reports
- Backend /api/bugs support query param source, dateFrom, dateTo
- Update API_URLS.getBugs dengan param baru
- Hapus seafile.ts (dead code, tidak digunakan)
2026-05-25 11:31:37 +08:00
cc81c8b91e Merge pull request 'amalia/22-mei-26' (#25) from amalia/22-mei-26 into main
Reviewed-on: #25
2026-05-22 17:40:30 +08:00
5515401614 fix: workflow dispatch ref dari main ke stg
Publish dan re-pull workflow harus di-trigger dari branch stg, bukan main,
agar kode yang di-build sesuai dengan yang di-deploy ke stg.
2026-05-22 17:30:19 +08:00
2e722fd8e3 chore: bump version to 0.1.15 2026-05-22 17:24:10 +08:00
f8c8aeed40 fix: deploy tool push ke remote build bukan origin
Sebelumnya push ke origin (Gitea) dengan branch build/stg, seharusnya ke
remote build (GitHub) branch stg.
2026-05-22 17:23:48 +08:00
312aaf9dd8 chore: bump version to 0.1.14 2026-05-22 17:11:12 +08:00
7d879d1901 feat: add show/hide and copy for API keys on dev page
- Display client key and server key on Settings app cards with toggle
  visibility and copy button
- Hide API keys table in Desa Mandiri Keys tab behind toggle + copy
- Add eye toggle to password inputs in Add App and Edit API Config
  modals
- Backend now returns apiKey and clientApiKey in apps list endpoint
2026-05-22 17:10:36 +08:00
4464f42da3 chore: bump version to 0.1.13 2026-05-22 14:29:21 +08:00
0846ac924c feat: time range selector & area chart improvements
- Add 7D/30D/3M toggle on Daily Activity and Comparison Between Villages charts
- Switch LineChart to AreaChart with fillOpacity 0.4 for bold gradient fill
- Fix broken tooltip on all charts with custom dark card content
- Apply consistent chart style (tickLine, gridAxis, glow) to village detail page
- api.ts: getDailyActivity and getComparisonActivity now accept range param
2026-05-22 14:16:31 +08:00
91dead0082 fix: resolve 5 bugs on app overview page
- Migrate useQuery to useSWR for consistency (no mixed fetching)
- Fix trend badge: guard against undefined grid and NaN comparison
- Fix trend badge: hide when increase is exactly 0
- Fix version modal: use gridRef so background refetch cannot overwrite user edits
- ErrorDataTable: migrate to useSWR, expose refresh() via forwardRef so the
  refresh button at the top also reloads the error table
2026-05-22 12:15:42 +08:00
7808de0db3 docs: split CLAUDE.md into focused reference files
Move Common Commands to docs/COMMANDS.md and add docs/CONVENTIONS.md
for frontend patterns (SWR, filters, Mantine, routing, API URLs).
CLAUDE.md now only contains runtime rules and pointers.
2026-05-22 12:08:39 +08:00
0afc2e271a feat: improve logs page with debounce, action/village/date filters, and timestamp fix 2026-05-22 11:37:37 +08:00
603a0a04b7 feat: server-side filter, village filter, and sortable columns on users page 2026-05-22 11:17:38 +08:00
ed9f59f404 feat: add status and role filter on users page 2026-05-22 11:07:01 +08:00
b79c63a5e8 refactor: improve users page code quality
- extract shared UserFormFields component to eliminate form duplication between Add and Edit modals
- debounce search input (400ms) to prevent excessive API calls
- fix validation messages to show human-readable labels instead of internal field names
- fix pagination visibility condition (totalPage > 1)
- remove unused TbEdit import
2026-05-22 11:04:56 +08:00
4d5c2bf632 Merge pull request 'amalia/20-mei-26' (#24) from amalia/20-mei-26 into main
Reviewed-on: #24
2026-05-20 17:23:15 +08:00
c782f956e0 chore: bump version to 0.1.12 2026-05-20 14:08:35 +08:00
515ee01d53 chore: bump version to 0.1.11 2026-05-20 13:57:48 +08:00
058dd95b4f refactor: rename and reorder dev panel tabs for clarity
- Rename "API Keys" → "Desa Mandiri Keys" (tab + panel title + description)
- Rename "Settings" → "App Config" (tab + panel title)
- Move "Desa Mandiri Keys" to last position with a divider separator
- Import Divider from @mantine/core
2026-05-20 12:32:06 +08:00
ef2183ffb7 chore: bump version to 0.1.10 2026-05-19 15:40:05 +08:00
9afe9297e0 Merge pull request 'amalia/18-mei-26' (#23) from amalia/18-mei-26 into main
Reviewed-on: #23
2026-05-18 17:26:01 +08:00
f98fb51cfd feat: tambah field isApprover pada edit user modal 2026-05-18 16:42:32 +08:00
3b8eabc111 fix: gender select value M/F instead of Male/Female 2026-05-18 16:31:43 +08:00
88ddb7527e Merge pull request 'chore: bump version to 0.1.9' (#22) from amalia/15-mei-26 into main
Reviewed-on: #22
2026-05-15 14:22:43 +08:00
abca720f89 chore: bump version to 0.1.9 2026-05-15 11:51:57 +08:00
a69b0aad48 Merge pull request 'upd: setting api key sistem desa mandiri' (#21) from amalia/13-mei-26 into main
Reviewed-on: #21
2026-05-13 17:24:37 +08:00
2cb061ea7f upd: setting api key sistem desa mandiri 2026-05-13 17:23:27 +08:00
a53309bf15 Merge pull request 'amalia/12-mei-26' (#20) from amalia/12-mei-26 into main
Reviewed-on: #20
2026-05-12 17:24:25 +08:00
b75a51727b chore: bump version to 0.1.8 2026-05-12 15:00:59 +08:00
6fdcc7f6ec fix: import logo as asset instead of hardcoded /src path 2026-05-12 15:00:44 +08:00
48118cad40 chore: bump version to 0.1.7 2026-05-12 14:27:39 +08:00
3cf656951d Merge remote-tracking branch 'origin/build/stg' into amalia/12-mei-26 2026-05-12 14:27:33 +08:00
7ca78ad39d chore: bump version to 0.1.6 2026-05-12 14:27:12 +08:00
18f719f551 Merge remote-tracking branch 'build/stg' into amalia/12-mei-26 2026-05-12 14:26:49 +08:00
fced7d4c1c feat: show isDummy flag on village detail and list pages 2026-05-12 14:10:29 +08:00
b39d1d5099 fix: update reset filters button style and remove filter icon 2026-05-12 11:47:48 +08:00
1831e757cd Merge pull request 'amalia/07-mei-26' (#19) from amalia/07-mei-26 into main
Reviewed-on: #19
2026-05-07 17:36:54 +08:00
f926ab2701 feat: add colored top border to stats cards 2026-05-07 12:21:08 +08:00
032386a549 feat: redesign login and splash screen with playful visual lift 2026-05-07 12:08:34 +08:00
5e44aa9021 chore: bump version to 0.1.6 2026-05-07 11:14:03 +08:00
273e4041e8 Merge branch 'amalia/05-mei-26' into stg 2026-05-07 11:13:13 +08:00
f469faf740 fix: add Secure flag to session cookies in production 2026-05-07 11:12:30 +08:00
f3c90ba290 chore: bump version to 0.1.4 2026-05-07 11:11:25 +08:00
d898671be9 Merge pull request 'amalia/05-mei-26' (#18) from amalia/05-mei-26 into main
Reviewed-on: #18
2026-05-05 17:28:45 +08:00
aea1cc1be2 chore: bump version to 0.1.5 2026-05-05 14:21:05 +08:00
77ccf4cf33 Merge remote-tracking branch 'build/stg' into stg 2026-05-05 14:19:46 +08:00
a50a9d6456 chore: bump version to 0.1.4 2026-05-05 13:56:39 +08:00
031180c6ec chore: bump version to 0.1.3 2026-05-05 12:44:29 +08:00
a73dcb1e89 refactor: simplify app status and response shape in API
Derive status from app.active flag instead of maintenance/bugs heuristic.
Remove version, minVersion, and maintenance from list/detail response
as these are fetched separately via the grid overview endpoint.
2026-05-05 12:43:36 +08:00
ef852842b4 feat: improve UI/UX consistency across all dashboard pages
Apply uniform design system across all routes and components:
- Consistent header pattern with gradient-text titles, dimmed subtitles
- Loader type="dots" replacing text-based loading states
- Icon + text empty/error states with Paper+glass containers
- Full STATUS_COLOR/STATUS_LABEL maps for all BugStatus values
- dayjs timestamps, Tooltip on action icons, size="sm" on badges/pagination
- Modals with overlayProps blur and gradient save buttons
- Replace left-border Papers with clean Stack headers
- Translate all remaining Indonesian UI strings to English
- New monitoring-themed SVG logo and redesigned splash screen
2026-05-05 12:42:41 +08:00
ee543a16ad Merge pull request 'amalia/30-apr-26' (#17) from amalia/30-apr-26 into main
Reviewed-on: #17
2026-04-30 17:27:11 +08:00
6cc86dafd8 Merge branch 'amalia/30-apr-26' into stg 2026-04-30 16:01:06 +08:00
73849304ae Merge branch 'stg' of https://github.com/bipprojectbali/monitoring-app into stg 2026-04-29 17:26:48 +08:00
6258c580a8 Merge branch 'amalia/29-apr-26' into stg 2026-04-29 17:24:52 +08:00
292e338a39 chore: bump version to 0.1.1
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-29 17:12:18 +08:00
90280fcac7 chore: bump version to 0.1.1
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-29 16:51:05 +08:00
Amalia
21e2923c02 Merge pull request #1 from bipprojectbali/amalia/29-apr-26
Amalia/29 apr 26
2026-04-29 14:00:13 +08:00
33 changed files with 3291 additions and 1946 deletions

3
.gitignore vendored
View File

@@ -30,6 +30,9 @@ src/frontend/routeTree.gen.ts
# IntelliJ based IDEs # IntelliJ based IDEs
.idea .idea
# Claude Code session data
.claude/
# Finder (MacOS) folder config # Finder (MacOS) folder config
.DS_Store .DS_Store

View File

@@ -13,31 +13,9 @@ Default to Bun instead of Node.js everywhere:
- `bunx <pkg>` not `npx` - `bunx <pkg>` not `npx`
- Bun auto-loads `.env` — never use dotenv. - Bun auto-loads `.env` — never use dotenv.
## Common Commands ## Commands
```bash See @docs/COMMANDS.md
bun run dev # dev server with hot reload (bun --watch src/serve.ts)
bun run build # Vite production build
bun run start # production server (NODE_ENV=production)
bun run typecheck # tsc --noEmit
bun run lint # biome check src/
bun run lint:fix # biome check --write src/
# Database
bun run db:migrate # prisma migrate dev
bun run db:seed # seed demo data
bun run db:generate # regenerate prisma client
bun run db:studio # Prisma Studio GUI
bun run db:push # push schema without migration
# Tests
bun run test # all tests
bun run test:unit # tests/unit/
bun run test:integration # tests/integration/ — no server needed
bun run test:e2e # tests/e2e/ — requires Lightpanda Docker
```
Run a single test file: `bun test tests/integration/auth.test.ts`
## Architecture ## Architecture
@@ -50,3 +28,7 @@ See @docs/TESTING.md
## Dev Tools ## Dev Tools
See @docs/DEV_TOOLS.md See @docs/DEV_TOOLS.md
## Frontend Conventions
See @docs/CONVENTIONS.md

25
docs/COMMANDS.md Normal file
View File

@@ -0,0 +1,25 @@
# Commands
```bash
bun run dev # dev server with hot reload (bun --watch src/serve.ts)
bun run build # Vite production build
bun run start # production server (NODE_ENV=production)
bun run typecheck # tsc --noEmit
bun run lint # biome check src/
bun run lint:fix # biome check --write src/
# Database
bun run db:migrate # prisma migrate dev
bun run db:seed # seed demo data
bun run db:generate # regenerate prisma client
bun run db:studio # Prisma Studio GUI
bun run db:push # push schema without migration
# Tests
bun run test # all tests
bun run test:unit # tests/unit/
bun run test:integration # tests/integration/ — no server needed
bun run test:e2e # tests/e2e/ — requires Lightpanda Docker
```
Run a single test file: `bun test tests/integration/auth.test.ts`

66
docs/CONVENTIONS.md Normal file
View File

@@ -0,0 +1,66 @@
# Frontend Conventions
## Data Fetching
- **SWR** for read-only data in route components (tables, lists, charts).
- **TanStack Query** (`useQuery`, `useMutation`) for auth state — see `src/frontend/hooks/useAuth.ts`.
- Never mix both in the same component/page.
- Debounce search inputs: `useDebouncedValue(search, 400)` + `useEffect` that only triggers when length >= 3 or === 0.
## API URL Builder
All URLs go through `src/frontend/config/api.ts``API_URLS`. Add new entries there, never inline URLs in components.
Desa+ endpoints are proxied via `/api/proxy/desa-plus``DESA_PLUS_PROXY` constant. The actual API source is at:
`/Users/wibu04/Documents/Projects/sistem-desa-mandiri/src/app/api/monitoring/[[...slug]]/route.ts`
## Filters & Pagination Pattern
Server-side filtering — always pass filter params to the API, never filter client-side on paginated data.
State pattern for a filtered table page:
```ts
const [page, setPage] = useState(1)
const [search, setSearch] = useState('') // raw input
const [searchQuery, setSearchQuery] = useState('') // debounced, sent to API
const [debouncedSearch] = useDebouncedValue(search, 400)
useEffect(() => {
if (debouncedSearch.length >= 3 || debouncedSearch.length === 0) {
setSearchQuery(debouncedSearch)
setPage(1)
}
}, [debouncedSearch])
useEffect(() => { setPage(1) }, [filterA, filterB]) // reset page on filter change
```
## Mantine Components
- Dark theme forced (`#242424`). Never add light-mode conditionals.
- `radius="md"` on inputs, `radius="2xl"` on container `Paper`.
- `className="glass"` on `Paper` cards for the frosted glass effect.
- `size="sm"` on table inputs and selects.
- Icons from `react-icons/tb` only — no other icon libraries.
- `DatePickerInput` from `@mantine/dates` with `type="range"` returns `[string | null, string | null]`, not Date objects.
## Route Files
File-based routing via TanStack Router Vite plugin. Files in `src/frontend/routes/`:
| Pattern | Route |
|---|---|
| `apps.$appId.tsx` | Layout wrapper for per-app pages |
| `apps.$appId.index.tsx` | Overview/dashboard for an app |
| `apps.$appId.users.index.tsx` | User management |
| `apps.$appId.logs.tsx` | Activity logs |
| `apps.$appId.villages.tsx` | Villages layout |
| `apps.$appId.villages.index.tsx` | Village list |
| `apps.$appId.villages.$villageId.tsx` | Village detail |
`routeTree.gen.ts` is auto-generated — never edit it manually.
## App Registration
App configs (ID, menu items) live in `src/frontend/config/appMenus.ts`. Add new apps there to register them.
Currently active app: `desa-plus`.

View File

@@ -4,9 +4,10 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="color-scheme" content="dark" /> <meta name="color-scheme" content="dark" />
<meta name="description" content="Monitoring System — real-time dashboard for your applications" />
<base href="/" /> <base href="/" />
<link rel="icon" type="image/svg+xml" href="/src/logo.svg" /> <link rel="icon" type="image/svg+xml" href="/src/logo.svg" />
<title>My App</title> <title>Monitoring System</title>
<style> <style>
/* Prevent white flash — dark background immediately */ /* Prevent white flash — dark background immediately */
html, body { html, body {
@@ -25,7 +26,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #242424; background-color: #242424;
transition: opacity 0.3s ease; transition: opacity 0.4s ease;
} }
#splash.fade-out { #splash.fade-out {
opacity: 0; opacity: 0;
@@ -35,32 +36,79 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
gap: 24px; gap: 18px;
} }
.splash-spinner { .splash-logo {
width: 40px; animation: logo-breathe 2.4s ease-in-out infinite;
height: 40px;
border: 3px solid #3a3a3a;
border-top-color: #339af0;
border-radius: 50%;
animation: spin 0.8s linear infinite;
} }
.splash-text { .splash-logo svg {
display: block;
border-radius: 14px;
filter: drop-shadow(0 8px 24px rgba(37, 99, 235, 0.45));
}
.splash-title {
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 17px;
color: #909296; font-weight: 700;
letter-spacing: 0.5px; letter-spacing: -0.3px;
background: linear-gradient(135deg, #2563EB 0%, #7C3AED 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
} }
@keyframes spin { .splash-dots {
to { transform: rotate(360deg); } display: flex;
gap: 7px;
align-items: center;
}
.splash-dots span {
width: 6px;
height: 6px;
border-radius: 50%;
background: linear-gradient(135deg, #2563EB, #7C3AED);
animation: dot-pulse 1.2s ease-in-out infinite;
}
.splash-dots span:nth-child(2) { animation-delay: 0.2s; }
.splash-dots span:nth-child(3) { animation-delay: 0.4s; }
@keyframes logo-breathe {
0%, 100% { transform: scale(1); opacity: 1; }
50% { transform: scale(1.05); opacity: 0.9; }
}
@keyframes dot-pulse {
0%, 80%, 100% { transform: scale(0.5); opacity: 0.25; }
40% { transform: scale(1); opacity: 1; }
} }
</style> </style>
</head> </head>
<body> <body>
<div id="splash"> <div id="splash">
<div class="splash-content"> <div class="splash-content">
<div class="splash-spinner"></div> <div class="splash-logo">
<div class="splash-text">Loading...</div> <svg width="64" height="64" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<defs>
<linearGradient id="sl" x1="0" y1="0" x2="32" y2="32" gradientUnits="userSpaceOnUse">
<stop stop-color="#2563EB"/>
<stop offset="1" stop-color="#7C3AED"/>
</linearGradient>
</defs>
<rect width="32" height="32" rx="7" fill="url(#sl)"/>
<polyline
points="3,16 9,16 12,8 16,24 19,16 29,16"
stroke="white"
stroke-width="2.2"
stroke-linecap="round"
stroke-linejoin="round"
fill="none"
/>
</svg>
</div>
<div class="splash-title">Monitoring System</div>
<div class="splash-dots">
<span></span>
<span></span>
<span></span>
</div>
</div> </div>
</div> </div>
<div id="root"></div> <div id="root"></div>

View File

@@ -1,6 +1,6 @@
{ {
"name": "bun-react-template", "name": "bun-react-template",
"version": "0.1.2", "version": "0.1.17",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {

View File

@@ -149,6 +149,3 @@ model BugLog {
@@map("bug_log") @@map("bug_log")
} }

View File

@@ -21,7 +21,7 @@ async function triggerWorkflow(workflow: string, inputs: Record<string, string>)
const res = await fetch(`${BASE_URL}/actions/workflows/${workflow}/dispatches`, { const res = await fetch(`${BASE_URL}/actions/workflows/${workflow}/dispatches`, {
method: 'POST', method: 'POST',
headers: ghHeaders, headers: ghHeaders,
body: JSON.stringify({ ref: 'main', inputs }), body: JSON.stringify({ ref: 'stg', inputs }),
}) })
if (!res.ok) throw new Error(`GitHub API error ${res.status}: ${await res.text()}`) if (!res.ok) throw new Error(`GitHub API error ${res.status}: ${await res.text()}`)
} }
@@ -150,7 +150,7 @@ server.tool(
} }
log.push('✅ Committed') log.push('✅ Committed')
const push = await sh(['git', 'push', 'origin', 'HEAD:build/stg']) const push = await sh(['git', 'push', 'build', 'HEAD:stg'])
if (!push.ok) { if (!push.ok) {
return { content: [{ type: 'text', text: `❌ git push gagal:\n${push.err}` }] } return { content: [{ type: 'text', text: `❌ git push gagal:\n${push.err}` }] }
} }

View File

@@ -8,9 +8,12 @@ import { prisma } from './lib/db'
import { env } from './lib/env' import { env } from './lib/env'
import { createSystemLog } from './lib/logger' import { createSystemLog } from './lib/logger'
import { getMinioDownloadUrl, uploadBugImage } from './lib/minio' import { getMinioDownloadUrl, uploadBugImage } from './lib/minio'
import { addConnection, broadcastToAdmins, getOnlineUserIds, removeConnection } from './lib/presence' import { addConnection, broadcastNotification, broadcastToAdmins, getOnlineUserIds, removeConnection } from './lib/presence'
import { parseSchema } from './lib/schema-parser' import { parseSchema } from './lib/schema-parser'
const isProduction = process.env.NODE_ENV === 'production'
const cookieFlags = isProduction ? '; Secure' : ''
function getPublicOrigin(request: Request): string { function getPublicOrigin(request: Request): string {
if (process.env.BUN_PUBLIC_BASE_URL) return process.env.BUN_PUBLIC_BASE_URL.replace(/\/$/, '') if (process.env.BUN_PUBLIC_BASE_URL) return process.env.BUN_PUBLIC_BASE_URL.replace(/\/$/, '')
const url = new URL(request.url) const url = new URL(request.url)
@@ -127,7 +130,7 @@ export function createApp() {
}) })
const headers = new Headers() const headers = new Headers()
headers.set('Location', `https://accounts.google.com/o/oauth2/v2/auth?${params}`) headers.set('Location', `https://accounts.google.com/o/oauth2/v2/auth?${params}`)
headers.set('Set-Cookie', `oauth_state=${state}; Path=/; HttpOnly; SameSite=Lax; Max-Age=600`) headers.set('Set-Cookie', `oauth_state=${state}; Path=/; HttpOnly; SameSite=Lax; Max-Age=600${cookieFlags}`)
return new Response(null, { status: 302, headers }) return new Response(null, { status: 302, headers })
}, { }, {
detail: { detail: {
@@ -212,8 +215,8 @@ export function createApp() {
const redirectPath = user.role === 'DEVELOPER' ? '/dev' : user.role === 'USER' ? '/profile' : '/dashboard' const redirectPath = user.role === 'DEVELOPER' ? '/dev' : user.role === 'USER' ? '/profile' : '/dashboard'
const headers = new Headers() const headers = new Headers()
headers.append('Location', redirectPath) headers.append('Location', redirectPath)
headers.append('Set-Cookie', `session=${token}; Path=/; HttpOnly; SameSite=Lax; Max-Age=86400`) headers.append('Set-Cookie', `session=${token}; Path=/; HttpOnly; SameSite=Lax; Max-Age=86400${cookieFlags}`)
headers.append('Set-Cookie', 'oauth_state=; Path=/; HttpOnly; Max-Age=0') headers.append('Set-Cookie', `oauth_state=; Path=/; HttpOnly; Max-Age=0${cookieFlags}`)
return new Response(null, { status: 302, headers }) return new Response(null, { status: 302, headers })
}, { }, {
detail: { detail: {
@@ -241,7 +244,7 @@ export function createApp() {
const token = crypto.randomUUID() const token = crypto.randomUUID()
const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000) // 24 hours const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000) // 24 hours
await prisma.session.create({ data: { token, userId: user.id, expiresAt } }) await prisma.session.create({ data: { token, userId: user.id, expiresAt } })
set.headers['set-cookie'] = `session=${token}; Path=/; HttpOnly; SameSite=Lax; Max-Age=86400` set.headers['set-cookie'] = `session=${token}; Path=/; HttpOnly; SameSite=Lax; Max-Age=86400${cookieFlags}`
await createSystemLog(user.id, 'LOGIN', 'Logged in successfully') await createSystemLog(user.id, 'LOGIN', 'Logged in successfully')
return { user: { id: user.id, name: user.name, email: user.email, role: user.role, image: user.image } } return { user: { id: user.id, name: user.name, email: user.email, role: user.role, image: user.image } }
}, { }, {
@@ -266,7 +269,7 @@ export function createApp() {
await prisma.session.deleteMany({ where: { token } }) await prisma.session.deleteMany({ where: { token } })
} }
} }
set.headers['set-cookie'] = 'session=; Path=/; HttpOnly; Max-Age=0' set.headers['set-cookie'] = `session=; Path=/; HttpOnly; Max-Age=0${cookieFlags}`
return { ok: true } return { ok: true }
}, { }, {
detail: { detail: {
@@ -363,13 +366,12 @@ export function createApp() {
return apps.map((app) => ({ return apps.map((app) => ({
id: app.id, id: app.id,
name: app.name, name: app.name,
status: app.maintenance ? 'warning' : app.bugs.length > 0 ? 'error' : 'active', status: app.active ? 'active' : 'inactive',
errors: app.bugs.length, errors: app.bugs.length,
version: app.version ?? '-',
minVersion: app.minVersion,
maintenance: app.maintenance,
active: app.active, active: app.active,
urlApi: app.urlApi, urlApi: app.urlApi,
apiKey: app.apiKey ?? '',
clientApiKey: app.clientApiKey ?? '',
hasClientApiKey: !!app.clientApiKey, hasClientApiKey: !!app.clientApiKey,
})) }))
}, { }, {
@@ -400,11 +402,8 @@ export function createApp() {
return { return {
id: app.id, id: app.id,
name: app.name, name: app.name,
status: app.maintenance ? 'warning' : app.bugs.length > 0 ? 'error' : 'active', status: app.active ? 'active' : 'inactive',
errors: app.bugs.length, errors: app.bugs.length,
version: app.version ?? '-',
minVersion: app.minVersion,
maintenance: app.maintenance,
urlApi: app.urlApi, urlApi: app.urlApi,
totalBugs: app._count.bugs, totalBugs: app._count.bugs,
} }
@@ -806,6 +805,9 @@ export function createApp() {
const search = query.search || '' const search = query.search || ''
const app = query.app as any const app = query.app as any
const status = query.status as any const status = query.status as any
const source = query.source as any
const dateFrom = query.dateFrom
const dateTo = query.dateTo
const where: any = {} const where: any = {}
if (search) { if (search) {
@@ -822,6 +824,18 @@ export function createApp() {
if (status && status !== 'all') { if (status && status !== 'all') {
where.status = status where.status = status
} }
if (source && source !== 'all') {
where.source = source
}
if (dateFrom || dateTo) {
where.createdAt = {}
if (dateFrom) where.createdAt.gte = new Date(dateFrom)
if (dateTo) {
const end = new Date(dateTo)
end.setHours(23, 59, 59, 999)
where.createdAt.lte = end
}
}
const [bugs, total] = await Promise.all([ const [bugs, total] = await Promise.all([
prisma.bug.findMany({ prisma.bug.findMany({
@@ -853,10 +867,13 @@ export function createApp() {
search: t.Optional(t.String({ description: 'Cari berdasarkan deskripsi, device, OS, atau versi' })), search: t.Optional(t.String({ description: 'Cari berdasarkan deskripsi, device, OS, atau versi' })),
app: t.Optional(t.String({ description: 'Filter berdasarkan ID aplikasi, atau "all"' })), app: t.Optional(t.String({ description: 'Filter berdasarkan ID aplikasi, atau "all"' })),
status: t.Optional(t.String({ description: 'Filter status: OPEN | ON_HOLD | IN_PROGRESS | RESOLVED | RELEASED | CLOSED | all' })), status: t.Optional(t.String({ description: 'Filter status: OPEN | ON_HOLD | IN_PROGRESS | RESOLVED | RELEASED | CLOSED | all' })),
source: t.Optional(t.String({ description: 'Filter sumber: QC | SYSTEM | USER | all' })),
dateFrom: t.Optional(t.String({ description: 'Filter dari tanggal (YYYY-MM-DD)' })),
dateTo: t.Optional(t.String({ description: 'Filter sampai tanggal (YYYY-MM-DD)' })),
}), }),
detail: { detail: {
summary: 'List Bug Reports', summary: 'List Bug Reports',
description: 'Mengembalikan daftar bug report dengan pagination, beserta data pelapor, gambar, dan riwayat status (BugLog). Mendukung filter berdasarkan aplikasi dan status.', description: 'Mengembalikan daftar bug report dengan pagination, beserta data pelapor, gambar, dan riwayat status (BugLog). Mendukung filter berdasarkan aplikasi, status, source, dan tanggal.',
tags: ['Bugs'], tags: ['Bugs'],
}, },
}) })
@@ -904,6 +921,18 @@ export function createApp() {
}, },
}) })
broadcastNotification({
type: 'new_bug',
bug: {
id: bug.id,
description: bug.description,
appId: bug.appId,
source: bug.source,
affectedVersion: bug.affectedVersion,
createdAt: bug.createdAt,
},
})
return bug return bug
}, { }, {
body: t.Object({ body: t.Object({
@@ -1071,6 +1100,88 @@ export function createApp() {
}, },
}) })
// ─── Bug Statistics API ────────────────────────────
.get('/api/bugs/stats', async ({ query }) => {
const range = [7, 30, 90].includes(Number(query.range)) ? Number(query.range) : 7
const now = new Date()
const rangeStart = new Date(now.getTime() - range * 24 * 60 * 60 * 1000)
const [totalBugs, openBugs, statusGroups, appGroups, sourceGroups, resolvedBugs, trendData] = await Promise.all([
prisma.bug.count(),
prisma.bug.count({ where: { status: 'OPEN' } }),
prisma.bug.groupBy({ by: ['status'], _count: { id: true } }),
prisma.bug.groupBy({ by: ['appId'], _count: { id: true } }),
prisma.bug.groupBy({ by: ['source'], _count: { id: true } }),
prisma.bug.findMany({
where: { status: { in: ['RESOLVED', 'CLOSED'] } },
select: { createdAt: true, updatedAt: true },
}),
prisma.bug.findMany({
where: { createdAt: { gte: rangeStart } },
select: { createdAt: true },
orderBy: { createdAt: 'asc' },
}),
])
const byStatus = Object.fromEntries(statusGroups.map((g) => [g.status, g._count.id]))
const byApp = appGroups.map((g) => ({ appId: g.appId, count: g._count.id }))
const bySource = Object.fromEntries(sourceGroups.map((g) => [g.source, g._count.id]))
const totalResolutionMs = resolvedBugs.reduce((sum, b) => sum + (b.updatedAt.getTime() - b.createdAt.getTime()), 0)
const avgResolutionHours = resolvedBugs.length > 0
? Math.round(totalResolutionMs / resolvedBugs.length / (1000 * 60 * 60) * 10) / 10
: 0
const resolvedCount = (byStatus['RESOLVED'] || 0) + (byStatus['CLOSED'] || 0)
const resolutionRate = totalBugs > 0 ? Math.round((resolvedCount / totalBugs) * 100) : 0
const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
const trendMap: Record<string, number> = {}
const keyToLabel: Record<string, string> = {}
for (let i = 0; i < range; i++) {
const d = new Date(now)
d.setDate(d.getDate() - i)
const key = d.toISOString().slice(0, 10)
const label = `${d.getDate()} ${months[d.getMonth()]}`
keyToLabel[key] = label
trendMap[key] = 0
}
for (const b of trendData) {
const key = b.createdAt.toISOString().slice(0, 10)
if (key in trendMap) trendMap[key]++
}
const trend: { date: string; count: number }[] = []
for (let i = 0; i < range; i++) {
const d = new Date(now)
d.setDate(d.getDate() - i)
const key = d.toISOString().slice(0, 10)
trend.push({ date: keyToLabel[key] ?? key, count: trendMap[key] ?? 0 })
}
trend.reverse()
return {
totalBugs,
openBugs,
byStatus,
byApp,
bySource,
avgResolutionHours,
resolutionRate,
trend,
range,
}
}, {
query: t.Object({
range: t.Optional(t.String({ description: 'Rentang hari: 7, 30, atau 90 (default: 30)' })),
}),
detail: {
summary: 'Bug Statistics',
description: 'Statistik bug: total, distribusi status, per app, per source, avg resolution time, dan trend.',
tags: ['Bugs'],
},
})
// ─── System Status API ───────────────────────────── // ─── System Status API ─────────────────────────────
.get('/api/system/status', async () => { .get('/api/system/status', async () => {
try { try {
@@ -1224,9 +1335,11 @@ export function createApp() {
include: { user: { select: { id: true, role: true } } }, include: { user: { select: { id: true, role: true } } },
}) })
if (!session || session.expiresAt < new Date()) { ws.close(4001, 'Unauthorized'); return } if (!session || session.expiresAt < new Date()) { ws.close(4001, 'Unauthorized'); return }
const isAdmin = session.user.role === 'DEVELOPER' const role = session.user.role
const isAdmin = role === 'DEVELOPER'
const canReceiveNotifs = role === 'DEVELOPER' || role === 'ADMIN'
;(ws.data as unknown as { userId: string }).userId = session.user.id ;(ws.data as unknown as { userId: string }).userId = session.user.id
addConnection(ws as any, session.user.id, isAdmin) addConnection(ws as any, session.user.id, isAdmin, canReceiveNotifs)
}, },
close(ws) { removeConnection(ws as any) }, close(ws) { removeConnection(ws as any) },
message() {}, message() {},
@@ -1643,6 +1756,86 @@ export function createApp() {
return { sessions: result, summary: { totalSessions: result.length, activeSessions: active, expiredSessions: expired, onlineUsers: onlineIds.size, byRole } } return { sessions: result, summary: { totalSessions: result.length, activeSessions: active, expiredSessions: expired, onlineUsers: onlineIds.size, byRole } }
}) })
// ─── API Keys (proxied to desa-plus /api/monitoring/api-keys) ─────────────
.get('/api/admin/api-keys', async ({ request, set }) => {
const auth = await requireDeveloper(request, set)
if (!auth) return { error: set.status === 401 ? 'Unauthorized' : 'Forbidden' }
const app = await prisma.app.findUnique({ where: { id: 'desa-plus' } })
if (!app?.urlApi) { set.status = 503; return { error: 'desa-plus belum dikonfigurasi' } }
const res = await fetch(`${app.urlApi.replace(/\/$/, '')}/api/monitoring/api-keys`, {
headers: { 'x-api-key': app.apiKey ?? '' },
})
const json = await res.json()
return { keys: json.data ?? [] }
})
.get('/api/admin/api-keys/:id', async ({ request, set, params }) => {
const auth = await requireDeveloper(request, set)
if (!auth) return { error: set.status === 401 ? 'Unauthorized' : 'Forbidden' }
const app = await prisma.app.findUnique({ where: { id: 'desa-plus' } })
if (!app?.urlApi) { set.status = 503; return { error: 'desa-plus belum dikonfigurasi' } }
const res = await fetch(`${app.urlApi.replace(/\/$/, '')}/api/monitoring/api-keys/${params.id}`, {
headers: { 'x-api-key': app.apiKey ?? '' },
})
const json = await res.json()
set.status = res.status
return json
})
.post('/api/admin/api-keys', async ({ request, set }) => {
const auth = await requireDeveloper(request, set)
if (!auth) return { error: set.status === 401 ? 'Unauthorized' : 'Forbidden' }
const body = await request.json() as { name?: string }
if (!body.name?.trim()) { set.status = 400; return { error: 'name wajib diisi' } }
const app = await prisma.app.findUnique({ where: { id: 'desa-plus' } })
if (!app?.urlApi) { set.status = 503; return { error: 'desa-plus belum dikonfigurasi: urlApi kosong' } }
if (!app?.apiKey) { set.status = 503; return { error: 'desa-plus belum dikonfigurasi: apiKey kosong' } }
try {
const res = await fetch(`${app.urlApi.replace(/\/$/, '')}/api/monitoring/api-keys`, {
method: 'POST',
headers: { 'Content-Type': 'application/json', 'x-api-key': app.apiKey },
body: JSON.stringify({ name: body.name.trim() }),
})
const json = await res.json()
set.status = res.status
return { key: json.data ?? null }
} catch (e) {
set.status = 502
return { error: `Gagal menghubungi desa-plus: ${String(e)}` }
}
})
.patch('/api/admin/api-keys/:id', async ({ request, set, params }) => {
const auth = await requireDeveloper(request, set)
if (!auth) return { error: set.status === 401 ? 'Unauthorized' : 'Forbidden' }
const body = await request.json() as { isActive?: boolean }
const app = await prisma.app.findUnique({ where: { id: 'desa-plus' } })
if (!app?.urlApi) { set.status = 503; return { error: 'desa-plus belum dikonfigurasi' } }
const res = await fetch(`${app.urlApi.replace(/\/$/, '')}/api/monitoring/api-keys/${params.id}`, {
method: 'PATCH',
headers: { 'Content-Type': 'application/json', 'x-api-key': app.apiKey ?? '' },
body: JSON.stringify({ isActive: body.isActive }),
})
const json = await res.json()
set.status = res.status
return json
})
.delete('/api/admin/api-keys/:id', async ({ request, set, params }) => {
const auth = await requireDeveloper(request, set)
if (!auth) return { error: set.status === 401 ? 'Unauthorized' : 'Forbidden' }
const app = await prisma.app.findUnique({ where: { id: 'desa-plus' } })
if (!app?.urlApi) { set.status = 503; return { error: 'desa-plus belum dikonfigurasi' } }
const res = await fetch(`${app.urlApi.replace(/\/$/, '')}/api/monitoring/api-keys/${params.id}`, {
method: 'DELETE',
headers: { 'x-api-key': app.apiKey ?? '' },
})
const json = await res.json()
set.status = res.status
return json
})
// ─── Desa Plus Proxy ─────────────────────────────────────────────────────── // ─── Desa Plus Proxy ───────────────────────────────────────────────────────
.all('/api/proxy/desa-plus/*', async ({ request, set }) => { .all('/api/proxy/desa-plus/*', async ({ request, set }) => {

View File

@@ -1,6 +1,6 @@
import { Avatar, Button, Card, Group, Stack, Text, useComputedColorScheme } from '@mantine/core' import { Avatar, Badge, Button, Card, Group, Stack, Text, useComputedColorScheme } from '@mantine/core'
import { Link } from '@tanstack/react-router' import { Link } from '@tanstack/react-router'
import { TbChevronRight, TbDeviceMobile } from 'react-icons/tb' import { TbAlertTriangle, TbChevronRight, TbDeviceMobile } from 'react-icons/tb'
interface AppCardProps { interface AppCardProps {
id: string id: string
@@ -12,8 +12,9 @@ interface AppCardProps {
maintenance?: boolean maintenance?: boolean
} }
export function AppCard({ id, name, status, errors, version }: AppCardProps) { export function AppCard({ id, name, status, errors, version, maintenance }: AppCardProps) {
const statusColor = status === 'active' ? 'teal' : status === 'warning' ? 'orange' : 'red' const statusColor = maintenance ? 'gray' : status === 'active' ? 'teal' : status === 'warning' ? 'orange' : 'red'
const statusLabel = maintenance ? 'Maintenance' : status === 'active' ? 'Active' : status === 'warning' ? 'Warning' : 'Error'
const scheme = useComputedColorScheme('light', { getInitialValueInEffect: true }) const scheme = useComputedColorScheme('light', { getInitialValueInEffect: true })
return ( return (
@@ -35,7 +36,7 @@ export function AppCard({ id, name, status, errors, version }: AppCardProps) {
}, },
})} })}
> >
<Group justify="space-between" mb="lg"> <Group justify="space-between" mb="md">
<Group gap="md"> <Group gap="md">
<Avatar <Avatar
variant="gradient" variant="gradient"
@@ -45,39 +46,27 @@ export function AppCard({ id, name, status, errors, version }: AppCardProps) {
> >
<TbDeviceMobile size={26} /> <TbDeviceMobile size={26} />
</Avatar> </Avatar>
<Stack gap={0}> <Stack gap={2}>
<Text fw={700} size="lg" style={{ letterSpacing: '-0.3px' }}>{name}</Text> <Text fw={700} size="lg" style={{ letterSpacing: '-0.3px' }}>{name}</Text>
{/* <Text size="xs" c="dimmed" fw={600}>VERSION {version}</Text> */} {/* <Text size="xs" c="dimmed" fw={600} tt="uppercase">v{version}</Text> */}
</Stack> </Stack>
</Group> </Group>
{/* <Badge color={statusColor} variant="dot" size="sm"> <Badge color={statusColor} variant="dot" size="sm">
{status.toUpperCase()} {statusLabel}
</Badge> */} </Badge>
</Group> </Group>
{/* <Stack gap="md" mt="sm"> <Group justify="space-between" align="center" mb="xs">
<Box> <Text size="xs" c="dimmed" fw={500}>Open Errors</Text>
<Group justify="space-between" mb={6}> <Badge
<Group gap="xs"> color={errors > 0 ? 'red' : 'teal'}
<TbActivity size={16} color="#2563EB" /> variant="light"
<Text size="xs" fw={700} c="dimmed">USER ADOPTION</Text> size="sm"
</Group> leftSection={errors > 0 ? <TbAlertTriangle size={10} /> : undefined}
<Text size="sm" fw={700}>{users.toLocaleString()}</Text> >
</Group> {errors > 0 ? errors : 'None'}
<Progress value={85} size="sm" color="brand-blue" radius="xl" /> </Badge>
</Box> </Group>
<Box>
<Group justify="space-between" mb={6}>
<Group gap="xs">
<TbAlertTriangle size={16} color={errors > 0 ? '#ef4444' : '#64748b'} />
<Text size="xs" fw={700} c="dimmed">ERROR</Text>
</Group>
<Text size="sm" fw={700} color={errors > 0 ? 'red' : 'dimmed'}>{errors}</Text>
</Group>
<Progress value={errors > 0 ? 30 : 0} size="sm" color="red" radius="xl" />
</Box>
</Stack> */}
<Button <Button
component={Link} component={Link}
@@ -85,7 +74,7 @@ export function AppCard({ id, name, status, errors, version }: AppCardProps) {
variant="light" variant="light"
color="brand-blue" color="brand-blue"
fullWidth fullWidth
mt="xl" mt="md"
radius="md" radius="md"
rightSection={<TbChevronRight size={16} />} rightSection={<TbChevronRight size={16} />}
styles={{ styles={{
@@ -97,7 +86,7 @@ export function AppCard({ id, name, status, errors, version }: AppCardProps) {
} }
}} }}
> >
View Open Dashboard
</Button> </Button>
</Card> </Card>
) )

View File

@@ -1,7 +1,8 @@
import { BarChart, LineChart } from '@mantine/charts' import { AreaChart, BarChart } from '@mantine/charts'
import { import {
Badge, Badge,
Box, Box,
Button,
Group, Group,
Paper, Paper,
Stack, Stack,
@@ -11,14 +12,29 @@ import {
} from '@mantine/core' } from '@mantine/core'
import { TbArrowUpRight, TbChartBar, TbTimeline } from 'react-icons/tb' import { TbArrowUpRight, TbChartBar, TbTimeline } from 'react-icons/tb'
type DailyRange = 7 | 30 | 90
interface ChartProps { interface ChartProps {
data?: any[] data?: any[]
isLoading?: boolean isLoading?: boolean
} }
export function VillageActivityLineChart({ data = [], isLoading }: ChartProps) { interface ActivityChartProps extends ChartProps {
range?: DailyRange
onRangeChange?: (range: DailyRange) => void
}
const RANGE_OPTIONS: { value: DailyRange; label: string }[] = [
{ value: 7, label: '7D' },
{ value: 30, label: '30D' },
{ value: 90, label: '3M' },
]
export function VillageActivityLineChart({ data = [], isLoading, range = 7, onRangeChange }: ActivityChartProps) {
const theme = useMantineTheme() const theme = useMantineTheme()
const rangeLabel = range === 7 ? 'last 7 days' : range === 30 ? 'last 30 days' : 'last 3 months'
return ( return (
<Paper withBorder p="xl" radius="2xl" className="glass h-full"> <Paper withBorder p="xl" radius="2xl" className="glass h-full">
<Stack gap="md" h="100%"> <Stack gap="md" h="100%">
@@ -29,21 +45,28 @@ export function VillageActivityLineChart({ data = [], isLoading }: ChartProps) {
</ThemeIcon> </ThemeIcon>
<Box> <Box>
<Text fw={700} size="sm">DAILY ACTIVITY - ALL VILLAGES</Text> <Text fw={700} size="sm">DAILY ACTIVITY - ALL VILLAGES</Text>
<Text size="xs" c="dimmed">Trend over the last 7 days</Text> <Text size="xs" c="dimmed">Trend over the {rangeLabel}</Text>
</Box> </Box>
</Group> </Group>
{ <Group gap={4}>
isLoading && ( {RANGE_OPTIONS.map((opt) => (
<Badge variant="light" color="blue" size="sm" rightSection={<TbArrowUpRight size={12} />}> <Button
... key={opt.value}
</Badge> size="compact-xs"
) variant={range === opt.value ? 'filled' : 'subtle'}
} color="blue"
radius="md"
onClick={() => onRangeChange?.(opt.value)}
loading={isLoading && range === opt.value}
>
{opt.label}
</Button>
))}
</Group>
</Group> </Group>
<Box h={300} mt="lg"> <Box h={300} mt="lg">
<LineChart <AreaChart
h={300} h={300}
data={data} data={data}
dataKey="date" dataKey="date"
@@ -53,12 +76,33 @@ export function VillageActivityLineChart({ data = [], isLoading }: ChartProps) {
gridAxis="x" gridAxis="x"
withTooltip withTooltip
tooltipAnimationDuration={200} tooltipAnimationDuration={200}
fillOpacity={0.4}
tooltipProps={{ tooltipProps={{
allowEscapeViewBox: { x: true, y: false }, content: ({ active, payload, label }: any) => {
if (!active || !payload?.length) return null
return (
<div style={{
backgroundColor: '#1A1B1E',
padding: '8px 12px',
borderRadius: '6px',
border: '1px solid #373A40',
boxShadow: '0 4px 12px rgba(0,0,0,0.5)',
pointerEvents: 'none',
whiteSpace: 'nowrap',
}}>
<div style={{ fontSize: '12px', fontWeight: 600, color: '#C1C2C5', marginBottom: '4px' }}>
{label}
</div>
<div style={{ fontSize: '11px', color: '#2563EB' }}>
Activity: <span style={{ fontWeight: 700 }}>{payload[0].value}</span>
</div>
</div>
)
},
}} }}
styles={{ styles={{
root: { root: {
'.recharts-line-curve': { '.recharts-area-curve': {
strokeWidth: 3, strokeWidth: 3,
filter: 'drop-shadow(0 4px 8px rgba(37, 99, 235, 0.3))' filter: 'drop-shadow(0 4px 8px rgba(37, 99, 235, 0.3))'
} }
@@ -71,9 +115,11 @@ export function VillageActivityLineChart({ data = [], isLoading }: ChartProps) {
) )
} }
export function VillageComparisonBarChart({ data = [], isLoading }: ChartProps) { export function VillageComparisonBarChart({ data = [], isLoading, range = 7, onRangeChange }: ActivityChartProps) {
const theme = useMantineTheme() const theme = useMantineTheme()
const rangeLabel = range === 7 ? 'last 7 days' : range === 30 ? 'last 30 days' : 'last 3 months'
return ( return (
<Paper withBorder p="xl" radius="2xl" className="glass h-full"> <Paper withBorder p="xl" radius="2xl" className="glass h-full">
<Stack gap="md" h="100%"> <Stack gap="md" h="100%">
@@ -84,9 +130,24 @@ export function VillageComparisonBarChart({ data = [], isLoading }: ChartProps)
</ThemeIcon> </ThemeIcon>
<Box> <Box>
<Text fw={700} size="sm">USAGE COMPARISON BETWEEN VILLAGES</Text> <Text fw={700} size="sm">USAGE COMPARISON BETWEEN VILLAGES</Text>
<Text size="xs" c="dimmed">Most active village deployments</Text> <Text size="xs" c="dimmed">Most active village deployments {rangeLabel}</Text>
</Box> </Box>
</Group> </Group>
<Group gap={4}>
{RANGE_OPTIONS.map((opt) => (
<Button
key={opt.value}
size="compact-xs"
variant={range === opt.value ? 'filled' : 'subtle'}
color="violet"
radius="md"
onClick={() => onRangeChange?.(opt.value)}
loading={isLoading && range === opt.value}
>
{opt.label}
</Button>
))}
</Group>
</Group> </Group>
<Box h={300} mt="lg"> <Box h={300} mt="lg">

View File

@@ -1,5 +1,6 @@
import { APP_CONFIGS } from '@/frontend/config/appMenus' import { APP_CONFIGS } from '@/frontend/config/appMenus'
import { useLogout, useSession } from '@/frontend/hooks/useAuth' import { useLogout, useSession } from '@/frontend/hooks/useAuth'
import { usePresence } from '@/frontend/hooks/usePresence'
import React from 'react' import React from 'react'
import { import {
ActionIcon, ActionIcon,
@@ -24,12 +25,14 @@ import {
useMantineColorScheme useMantineColorScheme
} from '@mantine/core' } from '@mantine/core'
import { useDisclosure } from '@mantine/hooks' import { useDisclosure } from '@mantine/hooks'
import { notifications } from '@mantine/notifications'
import { useQuery } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query'
import { Link, useLocation, useMatches, useNavigate, useParams } from '@tanstack/react-router' import { Link, useLocation, useMatches, useNavigate, useParams } from '@tanstack/react-router'
import { import {
TbAlertTriangle, TbAlertTriangle,
TbApps, TbApps,
TbArrowLeft, TbArrowLeft,
TbBug,
TbChevronRight, TbChevronRight,
TbClock, TbClock,
TbDashboard, TbDashboard,
@@ -64,6 +67,20 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
const user = sessionData?.user const user = sessionData?.user
const logout = useLogout() const logout = useLogout()
// ─── Real-time bug notifications ─────────────────────
usePresence((bug) => {
const appLabel = bug.appId ? bug.appId.toUpperCase() : 'Unknown App'
notifications.show({
id: `new-bug-${bug.id}`,
title: `New bug report — ${appLabel}`,
message: bug.description.length > 80 ? `${bug.description.slice(0, 80)}` : bug.description,
color: 'red',
icon: React.createElement(TbBug, { size: 18 }),
autoClose: 8000,
withBorder: true,
})
})
// Redirect USER role to profile (pending approval) // Redirect USER role to profile (pending approval)
React.useEffect(() => { React.useEffect(() => {
if (!sessionLoading && user?.role === 'USER') { if (!sessionLoading && user?.role === 'USER') {

View File

@@ -6,32 +6,62 @@ import {
Divider, Divider,
Drawer, Drawer,
Group, Group,
Loader,
Paper, Paper,
ScrollArea, SimpleGrid,
Stack, Stack,
Table, Table,
Text, Text,
Title ThemeIcon,
Title,
Tooltip,
} from '@mantine/core' } from '@mantine/core'
import { useDisclosure } from '@mantine/hooks' import { useDisclosure } from '@mantine/hooks'
import { useQuery } from '@tanstack/react-query'
import { Link } from '@tanstack/react-router' import { Link } from '@tanstack/react-router'
import { useState } from 'react' import dayjs from 'dayjs'
import { forwardRef, useImperativeHandle, useState } from 'react'
import { TbBug, TbExternalLink, TbHistory, TbMessageReport } from 'react-icons/tb' import { TbBug, TbExternalLink, TbHistory, TbMessageReport } from 'react-icons/tb'
import useSWR from 'swr'
export interface ErrorDataTableHandle {
refresh: () => void
}
export interface ErrorDataTableProps { export interface ErrorDataTableProps {
appId?: string appId?: string
} }
export function ErrorDataTable({ appId }: ErrorDataTableProps) { const STATUS_COLOR: Record<string, string> = {
OPEN: 'red',
IN_PROGRESS: 'blue',
ON_HOLD: 'orange',
RESOLVED: 'teal',
RELEASED: 'green',
CLOSED: 'gray',
}
const STATUS_LABEL: Record<string, string> = {
OPEN: 'Open',
ON_HOLD: 'On Hold',
IN_PROGRESS: 'In Progress',
RESOLVED: 'Resolved',
RELEASED: 'Released',
CLOSED: 'Closed',
}
const fetcher = (url: string) => fetch(url).then((r) => r.json())
export const ErrorDataTable = forwardRef<ErrorDataTableHandle, ErrorDataTableProps>(
function ErrorDataTable({ appId }, ref) {
const [opened, { open, close }] = useDisclosure(false) const [opened, { open, close }] = useDisclosure(false)
const [selectedError, setSelectedError] = useState<any>(null) const [selectedError, setSelectedError] = useState<any>(null)
const [showStackTrace, setShowStackTrace] = useState(false) const [showStackTrace, setShowStackTrace] = useState(false)
const { data: bugsData, isLoading } = useQuery({ const { data: bugsData, isLoading, mutate } = useSWR(
queryKey: ['bugs', appId], `/api/bugs?app=${appId || 'all'}&limit=10`,
queryFn: () => fetch(`/api/bugs?app=${appId || 'all'}&limit=10`).then((r) => r.json()), fetcher
}) )
useImperativeHandle(ref, () => ({ refresh: mutate }))
const bugs = bugsData?.data || [] const bugs = bugsData?.data || []
@@ -41,54 +71,62 @@ export function ErrorDataTable({ appId }: ErrorDataTableProps) {
open() open()
} }
const getSeverityColor = (sev: string) => {
switch (sev?.toUpperCase()) {
case 'OPEN': return 'red'
case 'IN_PROGRESS': return 'orange'
case 'ON_HOLD': return 'yellow'
default: return 'gray'
}
}
return ( return (
<> <>
<Paper withBorder radius="2xl" className="glass overflow-hidden"> <Paper withBorder radius="2xl" className="glass" style={{ overflowX: 'auto' }}>
<Box p="xl" style={{ borderBottom: '1px solid rgba(255, 255, 255, 0.08)' }}> <Box p="lg" style={{ borderBottom: '1px solid rgba(255,255,255,0.08)' }}>
<Group justify="space-between"> <Group justify="space-between">
<Group gap="sm"> <Group gap="sm">
<ThemeIcon variant="light" color="red" size="lg" radius="md"> <ThemeIcon variant="light" color="red" size="lg" radius="md">
<TbBug size={20} /> <TbBug size={20} />
</ThemeIcon> </ThemeIcon>
<Text fw={700}>LATEST ERROR REPORTS</Text> <Stack gap={0}>
<Text fw={700} size="sm">Latest Error Reports</Text>
<Text size="xs" c="dimmed">Most recent open bugs</Text>
</Stack>
</Group> </Group>
<Button component={Link} to={appId ? `/apps/${appId}/errors` : '/bug-reports'} variant="subtle" size="compact-xs" color="blue" rightSection={<TbExternalLink size={14} />}> <Tooltip label="View all reports" withArrow>
View All Reports <Button
</Button> component={Link}
to={appId ? `/apps/${appId}/errors` : '/bug-reports'}
variant="subtle"
size="compact-sm"
color="blue"
rightSection={<TbExternalLink size={14} />}
>
View All
</Button>
</Tooltip>
</Group> </Group>
</Box> </Box>
<ScrollArea> <Table.ScrollContainer minWidth={520}>
<Table verticalSpacing="md" highlightOnHover className="data-table"> <Table verticalSpacing="sm" highlightOnHover className="data-table">
<Table.Thead bg="rgba(0,0,0,0.1)"> <Table.Thead>
<Table.Tr> <Table.Tr>
<Table.Th px="xl">Error Message</Table.Th> <Table.Th px="lg">Error Description</Table.Th>
<Table.Th>Reporter</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Reporter</Table.Th>
<Table.Th>App Version</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Version</Table.Th>
<Table.Th>Timestamp</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Reported</Table.Th>
<Table.Th pr="xl">Severity</Table.Th> <Table.Th pr="lg" style={{ whiteSpace: 'nowrap' }}>Status</Table.Th>
</Table.Tr> </Table.Tr>
</Table.Thead> </Table.Thead>
<Table.Tbody> <Table.Tbody>
{isLoading ? ( {isLoading ? (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={5} align="center" py="xl"> <Table.Td colSpan={5}>
Loading errors... <Group justify="center" py="xl">
<Loader size="sm" type="dots" />
</Group>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
) : bugs.length === 0 ? ( ) : bugs.length === 0 ? (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={5} align="center" py="xl"> <Table.Td colSpan={5}>
No errors found. <Stack align="center" gap="xs" py="xl">
<TbBug size={32} style={{ opacity: 0.25 }} />
<Text size="sm" c="dimmed">No error reports found.</Text>
</Stack>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
) : bugs.map((error: any) => ( ) : bugs.map((error: any) => (
@@ -97,31 +135,41 @@ export function ErrorDataTable({ appId }: ErrorDataTableProps) {
onClick={() => handleRowClick(error)} onClick={() => handleRowClick(error)}
style={{ cursor: 'pointer' }} style={{ cursor: 'pointer' }}
> >
<Table.Td px="xl"> <Table.Td px="lg">
<Text size="sm" fw={600} lineClamp={1}>{error.description}</Text> <Text size="sm" fw={600} lineClamp={1}>{error.description}</Text>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Badge variant="dot" color="brand-blue" radius="sm">{error.user?.name || error.userId || 'System'}</Badge> <Badge variant="light" color="brand-blue" size="sm">
{error.user?.name || error.userId || 'System'}
</Badge>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Text size="xs" fw={700} c="dimmed">{error.affectedVersion || 'N/A'}</Text> <Badge variant="light" color="gray" size="sm">
v{error.affectedVersion || 'N/A'}
</Badge>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td style={{ whiteSpace: 'nowrap' }}>
<Group gap={6}> <Group gap={4} wrap="nowrap">
<TbHistory size={12} color="gray" /> <TbHistory size={12} color="gray" />
<Text size="xs" c="dimmed">{new Date(error.createdAt).toLocaleString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false })}</Text> <Text size="xs" c="dimmed">
{dayjs(error.createdAt).format('D MMM YYYY, HH:mm')}
</Text>
</Group> </Group>
</Table.Td> </Table.Td>
<Table.Td pr="xl"> <Table.Td pr="lg">
<Badge color={getSeverityColor(error.status)} variant="light" size="sm"> <Badge
{(error.status || '').toUpperCase()} color={STATUS_COLOR[error.status?.toUpperCase()] ?? 'gray'}
variant="light"
size="sm"
>
{STATUS_LABEL[error.status?.toUpperCase()] ?? error.status}
</Badge> </Badge>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
))} ))}
</Table.Tbody> </Table.Tbody>
</Table> </Table>
</ScrollArea> </Table.ScrollContainer>
</Paper> </Paper>
<Drawer <Drawer
@@ -131,37 +179,68 @@ export function ErrorDataTable({ appId }: ErrorDataTableProps) {
size="md" size="md"
title={ title={
<Group gap="xs"> <Group gap="xs">
<TbMessageReport color="#ef4444" size={24} /> <TbMessageReport color="#ef4444" size={22} />
<Title order={4}>Error Investigation</Title> <Title order={4}>Error Detail</Title>
</Group> </Group>
} }
styles={{ styles={{
header: { padding: '24px', borderBottom: '1px solid var(--mantine-color-default-border)' }, header: { padding: '20px 24px', borderBottom: '1px solid var(--mantine-color-default-border)' },
}} }}
> >
{selectedError && ( {selectedError && (
<Stack p="lg" gap="xl"> <Stack p="lg" gap="xl">
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>MESSAGE</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Description</Text>
<Text fw={700} size="lg" color="red">{selectedError.description}</Text> <Text fw={600} size="sm">{selectedError.description}</Text>
</Box> </Box>
<SimpleGrid cols={2} spacing="lg"> <SimpleGrid cols={2} spacing="lg">
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>SOURCE</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Status</Text>
<Text fw={600}>{selectedError.source}</Text> <Badge
color={STATUS_COLOR[selectedError.status?.toUpperCase()] ?? 'gray'}
variant="light"
size="sm"
>
{STATUS_LABEL[selectedError.status?.toUpperCase()] ?? selectedError.status}
</Badge>
</Box> </Box>
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>APP VERSION</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Source</Text>
<Badge variant="outline">{selectedError.affectedVersion || 'N/A'}</Badge> <Badge variant="light" color="gray" size="sm">{selectedError.source}</Badge>
</Box>
<Box>
<Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">App Version</Text>
<Badge variant="light" color="gray" size="sm">v{selectedError.affectedVersion || 'N/A'}</Badge>
</Box>
<Box>
<Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Reported</Text>
<Text size="sm" fw={500}>{dayjs(selectedError.createdAt).format('D MMM YYYY, HH:mm')}</Text>
</Box> </Box>
</SimpleGrid> </SimpleGrid>
{selectedError.device && (
<Box>
<Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Device</Text>
<Text size="sm">{selectedError.device} · {selectedError.os}</Text>
</Box>
)}
{selectedError.feedBack && (
<>
<Divider opacity={0.1} />
<Box>
<Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Developer Feedback</Text>
<Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>{selectedError.feedBack}</Text>
</Box>
</>
)}
<Divider opacity={0.1} /> <Divider opacity={0.1} />
<Box> <Box>
<Group justify="space-between" mb="sm"> <Group justify="space-between" mb="sm">
<Text size="xs" fw={700} c="dimmed">STACK TRACE</Text> <Text size="xs" fw={700} c="dimmed" tt="uppercase">Stack Trace</Text>
<Button <Button
variant="subtle" variant="subtle"
size="compact-xs" size="compact-xs"
@@ -172,8 +251,12 @@ export function ErrorDataTable({ appId }: ErrorDataTableProps) {
</Button> </Button>
</Group> </Group>
{showStackTrace && ( {showStackTrace && (
<Code block color="red" style={{ whiteSpace: 'pre-wrap', lineHeight: 1.6, border: '1px solid var(--mantine-color-default-border)' }}> <Code
{selectedError.stackTrace} block
color="red"
style={{ whiteSpace: 'pre-wrap', lineHeight: 1.6, fontSize: 11, border: '1px solid var(--mantine-color-default-border)' }}
>
{selectedError.stackTrace || '(no stack trace)'}
</Code> </Code>
)} )}
</Box> </Box>
@@ -182,6 +265,4 @@ export function ErrorDataTable({ appId }: ErrorDataTableProps) {
</Drawer> </Drawer>
</> </>
) )
} })
import { SimpleGrid, ThemeIcon } from '@mantine/core'

View File

@@ -14,18 +14,21 @@ interface StatsCardProps {
} }
export function StatsCard({ title, value, description, icon: Icon, color, trend }: StatsCardProps) { export function StatsCard({ title, value, description, icon: Icon, color, trend }: StatsCardProps) {
const accentColor = `var(--mantine-color-${color ?? 'brand-blue'}-5)`
return ( return (
<Card <Card
withBorder withBorder
padding="lg" padding="lg"
radius="xl" radius="xl"
className="premium-card" className="premium-card"
styles={(theme) => ({ styles={{
root: { root: {
backgroundColor: 'var(--mantine-color-body)', backgroundColor: 'var(--mantine-color-body)',
borderColor: 'rgba(128,128,128,0.1)', borderColor: 'rgba(128,128,128,0.1)',
borderTop: `3px solid ${accentColor}`,
}, },
})} }}
> >
<Group justify="space-between" mb="xs"> <Group justify="space-between" mb="xs">
<ThemeIcon <ThemeIcon

View File

@@ -7,15 +7,34 @@ export const API_URLS = {
`${DESA_PLUS_PROXY}/api/monitoring/info-villages?id=${id}`, `${DESA_PLUS_PROXY}/api/monitoring/info-villages?id=${id}`,
gridVillages: (id: string) => gridVillages: (id: string) =>
`${DESA_PLUS_PROXY}/api/monitoring/grid-villages?id=${id}`, `${DESA_PLUS_PROXY}/api/monitoring/grid-villages?id=${id}`,
graphLogVillages: (id: string, time: string) => graphLogVillages: (id: string, time: string, dateFrom?: string, dateTo?: string) => {
`${DESA_PLUS_PROXY}/api/monitoring/graph-log-villages?id=${id}&time=${time}`, const params = new URLSearchParams({ id, time })
getUsers: (page: number, search: string) => if (dateFrom) params.set('dateFrom', dateFrom)
`${DESA_PLUS_PROXY}/api/monitoring/user?page=${page}&search=${encodeURIComponent(search)}`, if (dateTo) params.set('dateTo', dateTo)
getLogsAllVillages: (page: number, search: string) => return `${DESA_PLUS_PROXY}/api/monitoring/graph-log-villages?${params}`
`${DESA_PLUS_PROXY}/api/monitoring/log-all-villages?page=${page}&search=${encodeURIComponent(search)}`, },
getRecentVillageLogs: (id: string) =>
`${DESA_PLUS_PROXY}/api/monitoring/recent-village-logs?id=${id}`,
getUsers: (page: number, search: string, isActive?: string, idUserRole?: string, idVillage?: string, orderBy?: string, orderDir?: string) => {
const params = new URLSearchParams({ page: String(page), search })
if (isActive !== undefined) params.set('isActive', isActive)
if (idUserRole) params.set('idUserRole', idUserRole)
if (idVillage) params.set('idVillage', idVillage)
if (orderBy) params.set('orderBy', orderBy)
if (orderDir) params.set('orderDir', orderDir)
return `${DESA_PLUS_PROXY}/api/monitoring/user?${params}`
},
getLogsAllVillages: (page: number, search: string, action?: string, idVillage?: string, dateFrom?: string, dateTo?: string) => {
const params = new URLSearchParams({ page: String(page), search })
if (action) params.set('action', action)
if (idVillage) params.set('idVillage', idVillage)
if (dateFrom) params.set('dateFrom', dateFrom)
if (dateTo) params.set('dateTo', dateTo)
return `${DESA_PLUS_PROXY}/api/monitoring/log-all-villages?${params}`
},
getGridOverview: () => `${DESA_PLUS_PROXY}/api/monitoring/grid-overview`, getGridOverview: () => `${DESA_PLUS_PROXY}/api/monitoring/grid-overview`,
getDailyActivity: () => `${DESA_PLUS_PROXY}/api/monitoring/daily-activity`, getDailyActivity: (range: 7 | 30 | 90 = 7) => `${DESA_PLUS_PROXY}/api/monitoring/daily-activity?range=${range}`,
getComparisonActivity: () => `${DESA_PLUS_PROXY}/api/monitoring/comparison-activity`, getComparisonActivity: (range: 7 | 30 | 90 = 7) => `${DESA_PLUS_PROXY}/api/monitoring/comparison-activity?range=${range}`,
postVersionUpdate: () => `${DESA_PLUS_PROXY}/api/monitoring/version-update`, postVersionUpdate: () => `${DESA_PLUS_PROXY}/api/monitoring/version-update`,
createVillages: () => `${DESA_PLUS_PROXY}/api/monitoring/create-villages`, createVillages: () => `${DESA_PLUS_PROXY}/api/monitoring/create-villages`,
createUser: () => `${DESA_PLUS_PROXY}/api/monitoring/create-user`, createUser: () => `${DESA_PLUS_PROXY}/api/monitoring/create-user`,
@@ -38,9 +57,15 @@ export const API_URLS = {
createOperator: () => `/api/operators`, createOperator: () => `/api/operators`,
editOperator: (id: string) => `/api/operators/${id}`, editOperator: (id: string) => `/api/operators/${id}`,
deleteOperator: (id: string) => `/api/operators/${id}`, deleteOperator: (id: string) => `/api/operators/${id}`,
getBugs: (page: number, search: string, app: string, status: string) => getBugs: (page: number, search: string, app: string, status: string, source?: string, dateFrom?: string, dateTo?: string) => {
`/api/bugs?page=${page}&search=${encodeURIComponent(search)}&app=${app}&status=${status}`, const params = new URLSearchParams({ page: String(page), search: encodeURIComponent(search), app, status })
if (source && source !== 'all') params.set('source', source)
if (dateFrom) params.set('dateFrom', dateFrom)
if (dateTo) params.set('dateTo', dateTo)
return `/api/bugs?${params}`
},
createBug: () => `/api/bugs`, createBug: () => `/api/bugs`,
getBugStats: (range: 7 | 30 | 90 = 30) => `/api/bugs/stats?range=${range}`,
uploadImage: () => `/api/upload/image`, uploadImage: () => `/api/upload/image`,
updateBugStatus: (id: string) => `/api/bugs/${id}/status`, updateBugStatus: (id: string) => `/api/bugs/${id}/status`,
updateBugFeedback: (id: string) => `/api/bugs/${id}/feedback`, updateBugFeedback: (id: string) => `/api/bugs/${id}/feedback`,

View File

@@ -1,11 +1,22 @@
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { useSession } from './useAuth' import { useSession } from './useAuth'
export function usePresence() { export interface NewBugPayload {
id: string
description: string
appId: string | null
source: string
affectedVersion: string
createdAt: string
}
export function usePresence(onNewBug?: (bug: NewBugPayload) => void) {
const { data } = useSession() const { data } = useSession()
const [onlineUserIds, setOnlineUserIds] = useState<string[]>([]) const [onlineUserIds, setOnlineUserIds] = useState<string[]>([])
const wsRef = useRef<WebSocket | null>(null) const wsRef = useRef<WebSocket | null>(null)
const reconnectTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined) const reconnectTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)
const onNewBugRef = useRef(onNewBug)
onNewBugRef.current = onNewBug
useEffect(() => { useEffect(() => {
if (!data?.user) return if (!data?.user) return
@@ -18,6 +29,7 @@ export function usePresence() {
ws.onmessage = (e) => { ws.onmessage = (e) => {
const msg = JSON.parse(e.data) const msg = JSON.parse(e.data)
if (msg.type === 'presence') setOnlineUserIds(msg.online) if (msg.type === 'presence') setOnlineUserIds(msg.online)
if (msg.type === 'new_bug') onNewBugRef.current?.(msg.bug)
} }
ws.onclose = () => { ws.onclose = () => {
wsRef.current = null wsRef.current = null

View File

@@ -21,12 +21,14 @@ import {
TextInput, TextInput,
ThemeIcon, ThemeIcon,
Timeline, Timeline,
Title Title,
Tooltip,
} from '@mantine/core' } from '@mantine/core'
import { useDisclosure } from '@mantine/hooks' import { useDisclosure } from '@mantine/hooks'
import { notifications } from '@mantine/notifications' import { notifications } from '@mantine/notifications'
import { useQuery } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query'
import { createFileRoute, useParams } from '@tanstack/react-router' import { createFileRoute, useParams } from '@tanstack/react-router'
import dayjs from 'dayjs'
import { useState } from 'react' import { useState } from 'react'
import { import {
TbAlertTriangle, TbAlertTriangle,
@@ -35,7 +37,6 @@ import {
TbCircleX, TbCircleX,
TbDeviceDesktop, TbDeviceDesktop,
TbDeviceMobile, TbDeviceMobile,
TbFilter,
TbHistory, TbHistory,
TbPhoto, TbPhoto,
TbPlus, TbPlus,
@@ -47,43 +48,48 @@ export const Route = createFileRoute('/apps/$appId/errors')({
component: AppErrorsPage, component: AppErrorsPage,
}) })
const STATUS_COLOR: Record<string, string> = {
OPEN: 'red',
IN_PROGRESS: 'blue',
ON_HOLD: 'orange',
RESOLVED: 'teal',
RELEASED: 'green',
CLOSED: 'gray',
}
const STATUS_LABEL: Record<string, string> = {
OPEN: 'Open',
ON_HOLD: 'On Hold',
IN_PROGRESS: 'In Progress',
RESOLVED: 'Resolved',
RELEASED: 'Released',
CLOSED: 'Closed',
}
function AppErrorsPage() { function AppErrorsPage() {
const { appId } = useParams({ from: '/apps/$appId/errors' }) const { appId } = useParams({ from: '/apps/$appId/errors' })
const [page, setPage] = useState(1) const [page, setPage] = useState(1)
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const [app, setApp] = useState(appId)
const [status, setStatus] = useState('all') const [status, setStatus] = useState('all')
const [showLogs, setShowLogs] = useState<Record<string, boolean>>({}) const [showLogs, setShowLogs] = useState<Record<string, boolean>>({})
const [showStackTrace, setShowStackTrace] = useState<Record<string, boolean>>({}) const [showStackTrace, setShowStackTrace] = useState<Record<string, boolean>>({})
const toggleLogs = (bugId: string) => { const toggleLogs = (bugId: string) => setShowLogs((prev) => ({ ...prev, [bugId]: !prev[bugId] }))
setShowLogs((prev) => ({ ...prev, [bugId]: !prev[bugId] })) const toggleStackTrace = (bugId: string) => setShowStackTrace((prev) => ({ ...prev, [bugId]: !prev[bugId] }))
}
const toggleStackTrace = (bugId: string) => {
setShowStackTrace((prev) => ({ ...prev, [bugId]: !prev[bugId] }))
}
const { data, isLoading, refetch } = useQuery({ const { data, isLoading, refetch } = useQuery({
queryKey: ['bugs', { page, search, app, status }], queryKey: ['bugs', { page, search, app: appId, status }],
queryFn: () => queryFn: () => fetch(API_URLS.getBugs(page, search, appId, status)).then((r) => r.json()),
fetch(API_URLS.getBugs(page, search, app, status)).then((r) => r.json()),
}) })
// Fetch apps for the dropdown
const { data: appsList } = useQuery({ const { data: appsList } = useQuery({
queryKey: ['apps-list'], queryKey: ['apps-list'],
queryFn: () => fetch('/api/apps').then((r) => r.json()), queryFn: () => fetch('/api/apps').then((r) => r.json()),
}) })
// Image Preview
const [previewImage, setPreviewImage] = useState<string | null>(null) const [previewImage, setPreviewImage] = useState<string | null>(null)
// Create Bug Modal Logic
const [opened, { open, close }] = useDisclosure(false) const [opened, { open, close }] = useDisclosure(false)
const [isSubmitting, setIsSubmitting] = useState(false) const [isSubmitting, setIsSubmitting] = useState(false)
const [imageFiles, setImageFiles] = useState<File[]>([]) const [imageFiles, setImageFiles] = useState<File[]>([])
@@ -97,25 +103,17 @@ function AppErrorsPage() {
stackTrace: '', stackTrace: '',
}) })
// Update Status Modal Logic
const [updateModalOpened, { open: openUpdateModal, close: closeUpdateModal }] = useDisclosure(false) const [updateModalOpened, { open: openUpdateModal, close: closeUpdateModal }] = useDisclosure(false)
const [isUpdating, setIsUpdating] = useState(false) const [isUpdating, setIsUpdating] = useState(false)
const [selectedBugId, setSelectedBugId] = useState<string | null>(null) const [selectedBugId, setSelectedBugId] = useState<string | null>(null)
const [updateForm, setUpdateForm] = useState({ const [updateForm, setUpdateForm] = useState({ status: '', description: '' })
status: '',
description: '',
})
// Feedback Modal Logic
const [feedbackModalOpened, { open: openFeedbackModal, close: closeFeedbackModal }] = useDisclosure(false) const [feedbackModalOpened, { open: openFeedbackModal, close: closeFeedbackModal }] = useDisclosure(false)
const [isUpdatingFeedback, setIsUpdatingFeedback] = useState(false) const [isUpdatingFeedback, setIsUpdatingFeedback] = useState(false)
const [feedbackForm, setFeedbackForm] = useState({ const [feedbackForm, setFeedbackForm] = useState({ feedBack: '' })
feedBack: '',
})
const handleUpdateFeedback = async () => { const handleUpdateFeedback = async () => {
if (!selectedBugId || !feedbackForm.feedBack) return if (!selectedBugId || !feedbackForm.feedBack) return
setIsUpdatingFeedback(true) setIsUpdatingFeedback(true)
try { try {
const res = await fetch(API_URLS.updateBugFeedback(selectedBugId), { const res = await fetch(API_URLS.updateBugFeedback(selectedBugId), {
@@ -123,27 +121,16 @@ function AppErrorsPage() {
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(feedbackForm), body: JSON.stringify(feedbackForm),
}) })
if (res.ok) { if (res.ok) {
notifications.show({ notifications.show({ title: 'Success', message: 'Feedback has been updated.', color: 'teal', icon: <TbCircleCheck size={18} /> })
title: 'Success',
message: 'Feedback has been updated.',
color: 'teal',
icon: <TbCircleCheck size={18} />,
})
refetch() refetch()
closeFeedbackModal() closeFeedbackModal()
setFeedbackForm({ feedBack: '' }) setFeedbackForm({ feedBack: '' })
} else { } else {
throw new Error('Failed to update feedback') throw new Error()
} }
} catch (e) { } catch {
notifications.show({ notifications.show({ title: 'Error', message: 'Something went wrong.', color: 'red', icon: <TbCircleX size={18} /> })
title: 'Error',
message: 'Something went wrong.',
color: 'red',
icon: <TbCircleX size={18} />,
})
} finally { } finally {
setIsUpdatingFeedback(false) setIsUpdatingFeedback(false)
} }
@@ -151,7 +138,6 @@ function AppErrorsPage() {
const handleUpdateStatus = async () => { const handleUpdateStatus = async () => {
if (!selectedBugId || !updateForm.status) return if (!selectedBugId || !updateForm.status) return
setIsUpdating(true) setIsUpdating(true)
try { try {
const res = await fetch(API_URLS.updateBugStatus(selectedBugId), { const res = await fetch(API_URLS.updateBugStatus(selectedBugId), {
@@ -159,27 +145,16 @@ function AppErrorsPage() {
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(updateForm), body: JSON.stringify(updateForm),
}) })
if (res.ok) { if (res.ok) {
notifications.show({ notifications.show({ title: 'Success', message: 'Status has been updated.', color: 'teal', icon: <TbCircleCheck size={18} /> })
title: 'Success',
message: 'Status has been updated.',
color: 'teal',
icon: <TbCircleCheck size={18} />,
})
refetch() refetch()
closeUpdateModal() closeUpdateModal()
setUpdateForm({ status: '', description: '' }) setUpdateForm({ status: '', description: '' })
} else { } else {
throw new Error('Failed to update status') throw new Error()
} }
} catch (e) { } catch {
notifications.show({ notifications.show({ title: 'Error', message: 'Something went wrong.', color: 'red', icon: <TbCircleX size={18} /> })
title: 'Error',
message: 'Something went wrong.',
color: 'red',
icon: <TbCircleX size={18} />,
})
} finally { } finally {
setIsUpdating(false) setIsUpdating(false)
} }
@@ -187,14 +162,9 @@ function AppErrorsPage() {
const handleCreateBug = async () => { const handleCreateBug = async () => {
if (!createForm.description || !createForm.affectedVersion || !createForm.device || !createForm.os) { if (!createForm.description || !createForm.affectedVersion || !createForm.device || !createForm.os) {
notifications.show({ notifications.show({ title: 'Validation Error', message: 'Please fill in all required fields.', color: 'red' })
title: 'Validation Error',
message: 'Please fill in all required fields.',
color: 'red',
})
return return
} }
setIsSubmitting(true) setIsSubmitting(true)
try { try {
const imageUrls: string[] = [] const imageUrls: string[] = []
@@ -202,52 +172,31 @@ function AppErrorsPage() {
const formData = new FormData() const formData = new FormData()
formData.append('file', file) formData.append('file', file)
const uploadRes = await fetch(API_URLS.uploadImage(), { method: 'POST', body: formData }) const uploadRes = await fetch(API_URLS.uploadImage(), { method: 'POST', body: formData })
if (!uploadRes.ok) throw new Error('Gagal mengupload gambar') if (!uploadRes.ok) throw new Error('Failed to upload image')
const { url } = await uploadRes.json() const { url } = await uploadRes.json()
imageUrls.push(url) imageUrls.push(url)
} }
const res = await fetch(API_URLS.createBug(), { const res = await fetch(API_URLS.createBug(), {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ ...createForm, imageUrls: imageUrls.length ? imageUrls : undefined }), body: JSON.stringify({ ...createForm, imageUrls: imageUrls.length ? imageUrls : undefined }),
}) })
if (res.ok) { if (res.ok) {
await fetch(API_URLS.createLog(), { await fetch(API_URLS.createLog(), {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ type: 'CREATE', message: `Report error baru ditambahkan: ${createForm.description.substring(0, 50)}${createForm.description.length > 50 ? '...' : ''}` }) body: JSON.stringify({ type: 'CREATE', message: `New error report added: ${createForm.description.substring(0, 50)}${createForm.description.length > 50 ? '...' : ''}` }),
}).catch(console.error) }).catch(console.error)
notifications.show({ title: 'Success', message: 'Error report has been created.', color: 'teal', icon: <TbCircleCheck size={18} /> })
notifications.show({
title: 'Success',
message: 'Error report has been created.',
color: 'teal',
icon: <TbCircleCheck size={18} />,
})
refetch() refetch()
close() close()
setImageFiles([]) setImageFiles([])
setCreateForm({ setCreateForm({ description: '', app: appId, source: 'USER', affectedVersion: '', device: '', os: '', stackTrace: '' })
description: '',
app: appId,
source: 'USER',
affectedVersion: '',
device: '',
os: '',
stackTrace: '',
})
} else { } else {
throw new Error('Failed to create error report') throw new Error()
} }
} catch (e) { } catch {
notifications.show({ notifications.show({ title: 'Error', message: 'Something went wrong.', color: 'red', icon: <TbCircleX size={18} /> })
title: 'Error',
message: 'Something went wrong.',
color: 'red',
icon: <TbCircleX size={18} />,
})
} finally { } finally {
setIsSubmitting(false) setIsSubmitting(false)
} }
@@ -257,16 +206,19 @@ function AppErrorsPage() {
const totalPages = data?.totalPages || 1 const totalPages = data?.totalPages || 1
return ( return (
<Stack gap="xl"> <Stack gap="xl" py="md">
<Group justify="space-between" align="center"> <Group justify="space-between" align="flex-start">
<Stack gap={0}> <Stack gap={4}>
<Title order={3}>Error Reporting Center</Title> <Title order={3}>Error Reports</Title>
<Text size="sm" c="dimmed">Advanced analysis of health issues and crashes for <b>{appId}</b>.</Text> <Text size="sm" c="dimmed">
Bug reports and crash tracking for this application.
</Text>
</Stack> </Stack>
<Button <Button
variant="gradient" variant="gradient"
gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }} gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }}
leftSection={<TbPlus size={18} />} leftSection={<TbPlus size={18} />}
size="sm"
onClick={open} onClick={open}
> >
Report Error Report Error
@@ -278,7 +230,7 @@ function AppErrorsPage() {
opened={!!previewImage} opened={!!previewImage}
onClose={() => setPreviewImage(null)} onClose={() => setPreviewImage(null)}
size="xl" size="xl"
radius="xl" radius="md"
padding={0} padding={0}
withCloseButton={false} withCloseButton={false}
overlayProps={{ backgroundOpacity: 0.75, blur: 6 }} overlayProps={{ backgroundOpacity: 0.75, blur: 6 }}
@@ -286,12 +238,7 @@ function AppErrorsPage() {
onClick={() => setPreviewImage(null)} onClick={() => setPreviewImage(null)}
> >
{previewImage && ( {previewImage && (
<Image <Image src={previewImage} alt="Preview" fit="contain" style={{ maxHeight: '85vh', width: '100%' }} />
src={previewImage}
alt="Preview"
fit="contain"
style={{ maxHeight: '85vh', width: '100%' }}
/>
)} )}
</Modal> </Modal>
@@ -299,28 +246,21 @@ function AppErrorsPage() {
opened={updateModalOpened} opened={updateModalOpened}
onClose={closeUpdateModal} onClose={closeUpdateModal}
title={<Text fw={700} size="lg">Update Bug Status</Text>} title={<Text fw={700} size="lg">Update Bug Status</Text>}
radius="xl" radius="md"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }} overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
<Stack gap="md"> <Stack gap="md">
<Select <Select
label="New Status" label="New Status"
placeholder="Select status" placeholder="Select a status"
required required
data={[ data={Object.entries(STATUS_LABEL).map(([value, label]) => ({ value, label }))}
{ value: 'OPEN', label: 'Open' },
{ value: 'ON_HOLD', label: 'On Hold' },
{ value: 'IN_PROGRESS', label: 'In Progress' },
{ value: 'RESOLVED', label: 'Resolved' },
{ value: 'RELEASED', label: 'Released' },
{ value: 'CLOSED', label: 'Closed' },
]}
value={updateForm.status} value={updateForm.status}
onChange={(val) => setUpdateForm({ ...updateForm, status: val || '' })} onChange={(val) => setUpdateForm({ ...updateForm, status: val || '' })}
/> />
<Textarea <Textarea
label="Update Note (Optional)" label="Update Note (Optional)"
placeholder="E.g. Fixed in commit xxxxx / Assigned to team" placeholder="e.g. Fixed in commit abc123 / Assigned to team"
minRows={3} minRows={3}
value={updateForm.description} value={updateForm.description}
onChange={(e) => setUpdateForm({ ...updateForm, description: e.target.value })} onChange={(e) => setUpdateForm({ ...updateForm, description: e.target.value })}
@@ -342,7 +282,7 @@ function AppErrorsPage() {
opened={feedbackModalOpened} opened={feedbackModalOpened}
onClose={closeFeedbackModal} onClose={closeFeedbackModal}
title={<Text fw={700} size="lg">Developer Feedback</Text>} title={<Text fw={700} size="lg">Developer Feedback</Text>}
radius="xl" radius="md"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }} overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
<Stack gap="md"> <Stack gap="md">
@@ -353,7 +293,7 @@ function AppErrorsPage() {
required required
minRows={4} minRows={4}
value={feedbackForm.feedBack} value={feedbackForm.feedBack}
onChange={(e) => setFeedbackForm({ ...feedbackForm, feedBack: e.target.value })} onChange={(e) => setFeedbackForm({ feedBack: e.target.value })}
/> />
<Button <Button
fullWidth fullWidth
@@ -370,9 +310,9 @@ function AppErrorsPage() {
<Modal <Modal
opened={opened} opened={opened}
onClose={() => { close(); setImageFiles([]); }} onClose={() => { close(); setImageFiles([]) }}
title={<Text fw={700} size="lg">Report New Error</Text>} title={<Text fw={700} size="lg">Report New Error</Text>}
radius="xl" radius="md"
size="lg" size="lg"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }} overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
@@ -385,7 +325,6 @@ function AppErrorsPage() {
value={createForm.description} value={createForm.description}
onChange={(e) => setCreateForm({ ...createForm, description: e.target.value })} onChange={(e) => setCreateForm({ ...createForm, description: e.target.value })}
/> />
<SimpleGrid cols={2}> <SimpleGrid cols={2}>
<Select <Select
label="Application" label="Application"
@@ -406,19 +345,17 @@ function AppErrorsPage() {
onChange={(val) => setCreateForm({ ...createForm, source: val as any })} onChange={(val) => setCreateForm({ ...createForm, source: val as any })}
/> />
</SimpleGrid> </SimpleGrid>
<TextInput <TextInput
label="Version" label="Affected Version"
placeholder="e.g. 2.4.1" placeholder="e.g. 2.4.1"
required required
value={createForm.affectedVersion} value={createForm.affectedVersion}
onChange={(e) => setCreateForm({ ...createForm, affectedVersion: e.target.value })} onChange={(e) => setCreateForm({ ...createForm, affectedVersion: e.target.value })}
/> />
<SimpleGrid cols={2}> <SimpleGrid cols={2}>
<TextInput <TextInput
label="Device" label="Device"
placeholder="e.g. iPhone 13, Windows 11 PC" placeholder="e.g. iPhone 13, Windows PC"
required required
value={createForm.device} value={createForm.device}
onChange={(e) => setCreateForm({ ...createForm, device: e.target.value })} onChange={(e) => setCreateForm({ ...createForm, device: e.target.value })}
@@ -431,17 +368,16 @@ function AppErrorsPage() {
onChange={(e) => setCreateForm({ ...createForm, os: e.target.value })} onChange={(e) => setCreateForm({ ...createForm, os: e.target.value })}
/> />
</SimpleGrid> </SimpleGrid>
<FileInput <FileInput
label="Screenshot (Optional)" label="Screenshots (Optional)"
placeholder="Klik untuk upload gambar..." placeholder="Click to upload images..."
accept="image/*" accept="image/*"
leftSection={<TbPhoto size={16} />} leftSection={<TbPhoto size={16} />}
description="Maks 3 gambar · 5MB per file · JPG, PNG, WEBP" description="Max 3 images · 5 MB each · JPG, PNG, WEBP"
value={imageFiles} value={imageFiles}
onChange={(files) => { onChange={(files) => {
if (files.length > 3) { if (files.length > 3) {
notifications.show({ title: 'Error', message: 'Maksimal 3 gambar', color: 'red' }) notifications.show({ title: 'Error', message: 'Maximum 3 images allowed.', color: 'red' })
return return
} }
setImageFiles(files) setImageFiles(files)
@@ -449,16 +385,14 @@ function AppErrorsPage() {
clearable clearable
multiple multiple
/> />
<Textarea <Textarea
label="Stack Trace (Optional)" label="Stack Trace (Optional)"
placeholder="Paste code or error logs here..." placeholder="Paste error logs or stack trace here..."
style={{ fontFamily: 'monospace' }} style={{ fontFamily: 'monospace' }}
minRows={2} minRows={2}
value={createForm.stackTrace} value={createForm.stackTrace}
onChange={(e) => setCreateForm({ ...createForm, stackTrace: e.target.value })} onChange={(e) => setCreateForm({ ...createForm, stackTrace: e.target.value })}
/> />
<Button <Button
fullWidth fullWidth
mt="md" mt="md"
@@ -473,47 +407,49 @@ function AppErrorsPage() {
</Modal> </Modal>
<Paper withBorder radius="2xl" className="glass" p="md"> <Paper withBorder radius="2xl" className="glass" p="md">
<SimpleGrid cols={{ base: 1, sm: 3 }} mb="md"> <SimpleGrid cols={{ base: 1, sm: 3 }} mb="lg">
<TextInput <TextInput
placeholder="Search description, device, os..." label="Search"
placeholder="Description, device, OS..."
leftSection={<TbSearch size={16} />} leftSection={<TbSearch size={16} />}
value={search} value={search}
onChange={(e) => setSearch(e.currentTarget.value)} onChange={(e) => setSearch(e.currentTarget.value)}
radius="md" radius="md"
size="sm"
/> />
<Select <Select
placeholder="Status" label="Status"
size="sm"
data={[ data={[
{ value: 'all', label: 'All Status' }, { value: 'all', label: 'All Status' },
{ value: 'OPEN', label: 'Open' }, ...Object.entries(STATUS_LABEL).map(([value, label]) => ({ value, label })),
{ value: 'ON_HOLD', label: 'On Hold' },
{ value: 'IN_PROGRESS', label: 'In Progress' },
{ value: 'RESOLVED', label: 'Resolved' },
{ value: 'RELEASED', label: 'Released' },
{ value: 'CLOSED', label: 'Closed' },
]} ]}
value={status} value={status}
onChange={(val) => setStatus(val || 'all')} onChange={(val) => setStatus(val || 'all')}
radius="md" radius="md"
/> />
<Group justify="flex-end"> <Stack justify="flex-end">
<Button variant="subtle" color="gray" leftSection={<TbFilter size={16} />} onClick={() => { setSearch(''); setStatus('all') }}> <Button
Reset variant="filled"
color="violet"
size="sm"
onClick={() => { setSearch(''); setStatus('all') }}
>
Reset Filters
</Button> </Button>
</Group> </Stack>
</SimpleGrid> </SimpleGrid>
{isLoading ? ( {isLoading ? (
<Stack align="center" py="xl"> <Stack align="center" py="xl">
<Loader size="lg" type="dots" /> <Loader size="md" type="dots" />
<Text size="sm" c="dimmed">Loading error reports...</Text>
</Stack> </Stack>
) : bugs.length === 0 ? ( ) : bugs.length === 0 ? (
<Paper p="xl" withBorder style={{ borderStyle: 'dashed', textAlign: 'center' }}> <Stack align="center" py="xl" gap="xs">
<TbBug size={48} color="gray" style={{ marginBottom: 12, opacity: 0.5 }} /> <TbBug size={40} style={{ opacity: 0.25 }} />
<Text fw={600}>No error reports found</Text> <Text fw={600} size="sm">No error reports found</Text>
<Text size="sm" c="dimmed">Try adjusting your filters or search terms.</Text> <Text size="sm" c="dimmed">Try adjusting your filters or search terms.</Text>
</Paper> </Stack>
) : ( ) : (
<Accordion variant="separated" radius="xl"> <Accordion variant="separated" radius="xl">
{bugs.map((bug: any) => ( {bugs.map((bug: any) => (
@@ -523,58 +459,44 @@ function AppErrorsPage() {
style={{ style={{
border: '1px solid var(--mantine-color-default-border)', border: '1px solid var(--mantine-color-default-border)',
background: 'var(--mantine-color-default)', background: 'var(--mantine-color-default)',
marginBottom: '12px', marginBottom: 12,
}} }}
> >
<Accordion.Control> <Accordion.Control>
<Group wrap="nowrap"> <Group wrap="nowrap" style={{ minWidth: 0 }}>
<ThemeIcon <ThemeIcon
color={ color={STATUS_COLOR[bug.status] ?? 'gray'}
bug.status === 'OPEN'
? 'red'
: bug.status === 'IN_PROGRESS'
? 'blue'
: 'teal'
}
variant="light" variant="light"
size="lg" size="lg"
radius="md" radius="md"
style={{ flexShrink: 0 }}
> >
<TbAlertTriangle size={20} /> <TbAlertTriangle size={20} />
</ThemeIcon> </ThemeIcon>
<Box style={{ flex: 1 }}> <Box style={{ flex: 1, minWidth: 0 }}>
<Group justify="space-between"> <Group wrap="nowrap" gap="xs">
<Text size="sm" fw={600} lineClamp={1}> <Text size="sm" fw={600} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>{bug.description}</Text>
{bug.description}
</Text>
<Badge <Badge
color={ color={STATUS_COLOR[bug.status] ?? 'gray'}
bug.status === 'OPEN'
? 'red'
: bug.status === 'IN_PROGRESS'
? 'blue'
: 'teal'
}
variant="dot" variant="dot"
size="xs" size="sm"
style={{ flexShrink: 0 }}
> >
{bug.status} {STATUS_LABEL[bug.status] ?? bug.status}
</Badge> </Badge>
</Group> </Group>
<Group gap="md"> <Text size="xs" c="dimmed" lineClamp={1}>
<Text size="xs" c="dimmed"> {dayjs(bug.createdAt).format('D MMM YYYY, HH:mm')} · {bug.appId?.toUpperCase()} · v{bug.affectedVersion}
{new Date(bug.createdAt).toLocaleString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false })} {bug.appId?.toUpperCase()} v{bug.affectedVersion} </Text>
</Text>
</Group>
</Box> </Box>
</Group> </Group>
</Accordion.Control> </Accordion.Control>
<Accordion.Panel> <Accordion.Panel>
<Stack gap="lg" py="xs"> <Stack gap="lg" py="xs">
{/* Device Info */}
<SimpleGrid cols={{ base: 1, sm: 2 }} spacing="lg"> <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="lg">
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>DEVICE METADATA</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Device Metadata</Text>
<Group gap="xs"> <Group gap="xs">
{bug.device.toLowerCase().includes('windows') || bug.device.toLowerCase().includes('mac') || bug.device.toLowerCase().includes('pc') ? ( {bug.device.toLowerCase().includes('windows') || bug.device.toLowerCase().includes('mac') || bug.device.toLowerCase().includes('pc') ? (
<TbDeviceDesktop size={14} color="gray" /> <TbDeviceDesktop size={14} color="gray" />
@@ -585,17 +507,16 @@ function AppErrorsPage() {
</Group> </Group>
</Box> </Box>
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>SOURCE</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Source</Text>
<Badge variant="light" color="gray" size="sm">{bug.source}</Badge> <Badge variant="light" color="gray" size="sm">{bug.source}</Badge>
</Box> </Box>
</SimpleGrid> </SimpleGrid>
{/* Feedback & Reporter Info */}
{(bug.user || bug.feedBack) && ( {(bug.user || bug.feedBack) && (
<SimpleGrid cols={{ base: 1, sm: 2 }} spacing="lg"> <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="lg">
{bug.user && ( {bug.user && (
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>REPORTED BY</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Reported By</Text>
<Group gap="xs"> <Group gap="xs">
<Avatar src={bug.user.image} radius="xl" size="sm" color="blue"> <Avatar src={bug.user.image} radius="xl" size="sm" color="blue">
{bug.user.name?.charAt(0).toUpperCase()} {bug.user.name?.charAt(0).toUpperCase()}
@@ -606,24 +527,18 @@ function AppErrorsPage() {
)} )}
{bug.feedBack && ( {bug.feedBack && (
<Box> <Box>
<Text size="xs" fw={700} c="dimmed" mb={4}>DEVELOPER FEEDBACK</Text> <Text size="xs" fw={700} c="dimmed" mb={4} tt="uppercase">Developer Feedback</Text>
<Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>{bug.feedBack}</Text> <Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>{bug.feedBack}</Text>
</Box> </Box>
)} )}
</SimpleGrid> </SimpleGrid>
)} )}
{/* Stack Trace */}
{bug.stackTrace && ( {bug.stackTrace && (
<Box> <Box>
<Group justify="space-between" mb={4}> <Group justify="space-between" mb={showStackTrace[bug.id] ? 8 : 0}>
<Text size="xs" fw={700} c="dimmed">STACK TRACE</Text> <Text size="xs" fw={700} c="dimmed" tt="uppercase">Stack Trace</Text>
<Button <Button variant="subtle" size="compact-xs" color="gray" onClick={() => toggleStackTrace(bug.id)}>
variant="subtle"
size="compact-xs"
color="gray"
onClick={() => toggleStackTrace(bug.id)}
>
{showStackTrace[bug.id] ? 'Hide' : 'Show'} {showStackTrace[bug.id] ? 'Hide' : 'Show'}
</Button> </Button>
</Group> </Group>
@@ -631,12 +546,7 @@ function AppErrorsPage() {
<Code <Code
block block
color="red" color="red"
style={{ style={{ fontFamily: 'monospace', whiteSpace: 'pre-wrap', fontSize: 11, border: '1px solid var(--mantine-color-default-border)' }}
fontFamily: 'monospace',
whiteSpace: 'pre-wrap',
fontSize: '11px',
border: '1px solid var(--mantine-color-default-border)',
}}
> >
{bug.stackTrace} {bug.stackTrace}
</Code> </Code>
@@ -644,43 +554,41 @@ function AppErrorsPage() {
</Box> </Box>
)} )}
{/* Images */}
{bug.images && bug.images.length > 0 && ( {bug.images && bug.images.length > 0 && (
<Box> <Box>
<Group gap="xs" mb={8}> <Group gap="xs" mb={8}>
<TbPhoto size={16} color="gray" /> <TbPhoto size={14} color="gray" />
<Text size="xs" fw={700} c="dimmed">ATTACHED IMAGES ({bug.images.length})</Text> <Text size="xs" fw={700} c="dimmed" tt="uppercase">
Attached Images ({bug.images.length})
</Text>
</Group> </Group>
<SimpleGrid cols={{ base: 2, sm: 4 }} spacing="xs"> <SimpleGrid cols={{ base: 2, sm: 4 }} spacing="xs">
{bug.images.map((img: any) => ( {bug.images.map((img: any) => (
<Paper <Tooltip key={img.id} label="Click to preview" withArrow>
key={img.id} <Paper
withBorder withBorder
radius="md" radius="md"
style={{ overflow: 'hidden', cursor: 'zoom-in' }} style={{ overflow: 'hidden', cursor: 'zoom-in' }}
onClick={() => setPreviewImage(img.imageUrl)} onClick={() => setPreviewImage(img.imageUrl)}
> >
<Image src={img.imageUrl} alt="Error screenshot" height={100} fit="cover" /> <Image src={img.imageUrl} alt="Error screenshot" height={100} fit="cover" />
</Paper> </Paper>
</Tooltip>
))} ))}
</SimpleGrid> </SimpleGrid>
</Box> </Box>
)} )}
{/* Logs / History */}
{bug.logs && bug.logs.length > 0 && ( {bug.logs && bug.logs.length > 0 && (
<Box> <Box>
<Group justify="space-between" mb={showLogs[bug.id] ? 12 : 0}> <Group justify="space-between" mb={showLogs[bug.id] ? 12 : 0}>
<Group gap="xs"> <Group gap="xs">
<TbHistory size={16} color="gray" /> <TbHistory size={14} color="gray" />
<Text size="xs" fw={700} c="dimmed">ACTIVITY LOG ({bug.logs.length})</Text> <Text size="xs" fw={700} c="dimmed" tt="uppercase">
Activity Log ({bug.logs.length})
</Text>
</Group> </Group>
<Button <Button variant="subtle" size="compact-xs" color="gray" onClick={() => toggleLogs(bug.id)}>
variant="subtle"
size="compact-xs"
color="gray"
onClick={() => toggleLogs(bug.id)}
>
{showLogs[bug.id] ? 'Hide' : 'Show'} {showLogs[bug.id] ? 'Hide' : 'Show'}
</Button> </Button>
</Group> </Group>
@@ -690,12 +598,16 @@ function AppErrorsPage() {
<Timeline.Item <Timeline.Item
key={log.id} key={log.id}
bullet={ bullet={
<Badge size="xs" circle color={log.status === 'RESOLVED' ? 'teal' : 'blue'}> </Badge> <Badge size="xs" circle color={STATUS_COLOR[log.status] ?? 'blue'}> </Badge>
}
title={
<Text size="sm" fw={600}>
{STATUS_LABEL[log.status] ?? log.status}
</Text>
} }
title={<Text size="sm" fw={600}>{log.status}</Text>}
> >
<Text size="xs" c="dimmed" mb={4}> <Text size="xs" c="dimmed" mb={4}>
{new Date(log.createdAt).toLocaleString()} by {log.user?.name || 'Unknown'} {dayjs(log.createdAt).format('D MMM YYYY, HH:mm')} · {log.user?.name ?? 'Unknown'}
</Text> </Text>
<Text size="sm">{log.description}</Text> <Text size="sm">{log.description}</Text>
</Timeline.Item> </Timeline.Item>
@@ -706,16 +618,30 @@ function AppErrorsPage() {
)} )}
<Group justify="flex-end" pt="sm"> <Group justify="flex-end" pt="sm">
<Button variant="light" size="compact-xs" color="blue" onClick={() => { <Button
setSelectedBugId(bug.id) variant="light"
setFeedbackForm({ feedBack: bug.feedBack || '' }) size="compact-sm"
openFeedbackModal() color="blue"
}}>Developer Feedback</Button> onClick={() => {
<Button variant="light" size="compact-xs" color="teal" onClick={() => { setSelectedBugId(bug.id)
setSelectedBugId(bug.id) setFeedbackForm({ feedBack: bug.feedBack || '' })
setUpdateForm({ status: bug.status, description: '' }) openFeedbackModal()
openUpdateModal() }}
}}>Update Status</Button> >
Developer Feedback
</Button>
<Button
variant="light"
size="compact-sm"
color="teal"
onClick={() => {
setSelectedBugId(bug.id)
setUpdateForm({ status: bug.status, description: '' })
openUpdateModal()
}}
>
Update Status
</Button>
</Group> </Group>
</Stack> </Stack>
</Accordion.Panel> </Accordion.Panel>
@@ -726,7 +652,7 @@ function AppErrorsPage() {
{totalPages > 1 && ( {totalPages > 1 && (
<Group justify="center" mt="xl"> <Group justify="center" mt="xl">
<Pagination total={totalPages} value={page} onChange={setPage} radius="xl" /> <Pagination total={totalPages} value={page} onChange={setPage} size="sm" radius="xl" />
</Group> </Group>
)} )}
</Paper> </Paper>

View File

@@ -1,9 +1,9 @@
import { useQuery } from '@tanstack/react-query'
import { VillageActivityLineChart, VillageComparisonBarChart } from '@/frontend/components/DashboardCharts' import { VillageActivityLineChart, VillageComparisonBarChart } from '@/frontend/components/DashboardCharts'
import { ErrorDataTable } from '@/frontend/components/ErrorDataTable' import { ErrorDataTable, type ErrorDataTableHandle } from '@/frontend/components/ErrorDataTable'
import { SummaryCard } from '@/frontend/components/SummaryCard' import { SummaryCard } from '@/frontend/components/SummaryCard'
import { useSession } from '@/frontend/hooks/useAuth' import { useSession } from '@/frontend/hooks/useAuth'
import { import {
ActionIcon,
Badge, Badge,
Button, Button,
Group, Group,
@@ -14,17 +14,19 @@ import {
Text, Text,
Textarea, Textarea,
TextInput, TextInput,
Title Title,
Tooltip,
} from '@mantine/core' } from '@mantine/core'
import { useDisclosure } from '@mantine/hooks' import { useDisclosure } from '@mantine/hooks'
import { notifications } from '@mantine/notifications' import { notifications } from '@mantine/notifications'
import { createFileRoute, useNavigate, useParams } from '@tanstack/react-router' import { createFileRoute, useNavigate, useParams } from '@tanstack/react-router'
import { useEffect, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { import {
TbActivity, TbActivity,
TbAlertTriangle, TbAlertTriangle,
TbBuildingCommunity, TbBuildingCommunity,
TbVersions TbRefresh,
TbVersions,
} from 'react-icons/tb' } from 'react-icons/tb'
import useSWR from 'swr' import useSWR from 'swr'
import { API_URLS } from '../config/api' import { API_URLS } from '../config/api'
@@ -42,42 +44,46 @@ function AppOverviewPage() {
const [versionModalOpened, { open: openVersionModal, close: closeVersionModal }] = useDisclosure(false) const [versionModalOpened, { open: openVersionModal, close: closeVersionModal }] = useDisclosure(false)
const { data: session } = useSession() const { data: session } = useSession()
const isDeveloper = session?.user?.role === 'DEVELOPER' const isDeveloper = session?.user?.role === 'DEVELOPER'
const errorTableRef = useRef<ErrorDataTableHandle>(null)
// Form State
const [latestVersion, setLatestVersion] = useState('') const [latestVersion, setLatestVersion] = useState('')
const [minVersion, setMinVersion] = useState('') const [minVersion, setMinVersion] = useState('')
const [messageUpdate, setMessageUpdate] = useState('') const [messageUpdate, setMessageUpdate] = useState('')
const [maintenance, setMaintenance] = useState(false) const [maintenance, setMaintenance] = useState(false)
const [isSaving, setIsSaving] = useState(false) const [isSaving, setIsSaving] = useState(false)
// Data Fetching const [dailyRange, setDailyRange] = useState<7 | 30 | 90>(7)
const { data: gridRes, isLoading: gridLoading, mutate: mutateGrid } = useSWR(isDesaPlus ? API_URLS.getGridOverview() : null, fetcher) const [comparisonRange, setComparisonRange] = useState<7 | 30 | 90>(7)
const { data: dailyRes, isLoading: dailyLoading, mutate: mutateDaily } = useSWR(isDesaPlus ? API_URLS.getDailyActivity() : null, fetcher)
const { data: comparisonRes, isLoading: comparisonLoading, mutate: mutateComparison } = useSWR(isDesaPlus ? API_URLS.getComparisonActivity() : null, fetcher)
const { data: appData, isLoading: appLoading } = useQuery({ const { data: gridRes, isLoading: gridLoading, mutate: mutateGrid } = useSWR(isDesaPlus ? API_URLS.getGridOverview() : null, fetcher)
queryKey: ['apps', appId], const { data: dailyRes, isLoading: dailyLoading, mutate: mutateDaily } = useSWR(isDesaPlus ? API_URLS.getDailyActivity(dailyRange) : null, fetcher)
queryFn: () => fetch(`/api/apps/${appId}`).then((r) => r.json()), const { data: comparisonRes, isLoading: comparisonLoading, mutate: mutateComparison } = useSWR(isDesaPlus ? API_URLS.getComparisonActivity(comparisonRange) : null, fetcher)
})
const { data: appData, isLoading: appLoading } = useSWR(`/api/apps/${appId}`, fetcher)
const grid = gridRes?.data const grid = gridRes?.data
const dailyData = dailyRes?.data || [] const dailyData = dailyRes?.data || []
const comparisonData = comparisonRes?.data || [] const comparisonData = comparisonRes?.data || []
// Initialize form when data loads or modal opens // Ref so the modal-sync effect always reads current grid without re-running on every background refetch
const gridRef = useRef(grid)
gridRef.current = grid
useEffect(() => { useEffect(() => {
if (grid?.version && versionModalOpened) { if (versionModalOpened && gridRef.current?.version) {
setLatestVersion(grid.version.mobile_latest_version || '') const v = gridRef.current.version
setMinVersion(grid.version.mobile_minimum_version || '') setLatestVersion(v.mobile_latest_version || '')
setMessageUpdate(grid.version.mobile_message_update || '') setMinVersion(v.mobile_minimum_version || '')
setMaintenance(grid.version.mobile_maintenance === 'true') setMessageUpdate(v.mobile_message_update || '')
setMaintenance(v.mobile_maintenance === 'true')
} }
}, [grid, versionModalOpened]) }, [versionModalOpened])
const handleRefresh = () => { const handleRefresh = () => {
mutateGrid() mutateGrid()
mutateDaily() mutateDaily()
mutateComparison() mutateComparison()
errorTableRef.current?.refresh()
} }
const handleSaveVersion = async () => { const handleSaveVersion = async () => {
@@ -98,37 +104,33 @@ function AppOverviewPage() {
await fetch(API_URLS.createLog(), { await fetch(API_URLS.createLog(), {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ type: 'UPDATE', message: `Update version information: ${JSON.stringify({ latestVersion, minVersion, maintenance, messageUpdate })}` }) body: JSON.stringify({ type: 'UPDATE', message: `Updated version info: latest=${latestVersion}, min=${minVersion}, maintenance=${maintenance}` }),
}).catch(console.error) }).catch(console.error)
notifications.show({ notifications.show({ title: 'Updated', message: 'Application version information has been saved.', color: 'teal' })
title: 'Update Successful',
message: 'Application version information has been updated.',
color: 'teal',
})
mutateGrid() mutateGrid()
closeVersionModal() closeVersionModal()
} else { } else {
notifications.show({ notifications.show({ title: 'Failed', message: 'Could not update version info. Please try again.', color: 'red' })
title: 'Update Failed',
message: 'Failed to update version information. Please check your data.',
color: 'red',
})
} }
} catch (error) { } catch {
notifications.show({ notifications.show({ title: 'Network Error', message: 'Could not connect to the server.', color: 'red' })
title: 'Network Error',
message: 'Could not connect to the server. Please try again later.',
color: 'red',
})
} finally { } finally {
setIsSaving(false) setIsSaving(false)
} }
} }
const maintenanceOn = grid?.version?.mobile_maintenance === 'true'
return ( return (
<> <>
<Modal opened={versionModalOpened} onClose={closeVersionModal} title="Update Version Information" radius="md"> <Modal
opened={versionModalOpened}
onClose={closeVersionModal}
title={<Text fw={700} size="lg">Update Version Info</Text>}
radius="xl"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
>
<Stack gap="md"> <Stack gap="md">
<TextInput <TextInput
label="Active Version" label="Active Version"
@@ -156,22 +158,39 @@ function AppOverviewPage() {
checked={maintenance} checked={maintenance}
onChange={(e) => setMaintenance(e.currentTarget.checked)} onChange={(e) => setMaintenance(e.currentTarget.checked)}
/> />
<Button fullWidth onClick={handleSaveVersion} loading={isSaving}>Save Changes</Button> <Button
fullWidth
mt="md"
variant="gradient"
gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }}
onClick={handleSaveVersion}
loading={isSaving}
>
Save Changes
</Button>
</Stack> </Stack>
</Modal> </Modal>
<Stack gap="xl"> <Stack gap="xl">
<Group justify="space-between"> <Group justify="space-between" align="flex-start">
<Stack gap={0}> <Stack gap={4}>
<Title order={3}>Overview</Title> <Title order={3}>Overview</Title>
<Text size="sm" c="dimmed">Detailed metrics for {isDesaPlus ? 'Desa+' : appId}</Text> <Text size="sm" c="dimmed">
Real-time metrics and activity for {isDesaPlus ? 'Desa+' : appId}.
</Text>
</Stack> </Stack>
<Tooltip label="Refresh data" withArrow>
{/* <Group gap="md"> <ActionIcon
<ActionIcon variant="light" color="brand-blue" size="lg" radius="md" onClick={handleRefresh}> variant="light"
<TbRefresh size={20} /> color="brand-blue"
size="lg"
radius="md"
onClick={handleRefresh}
loading={gridLoading || dailyLoading || comparisonLoading}
>
<TbRefresh size={18} />
</ActionIcon> </ActionIcon>
</Group> */} </Tooltip>
</Group> </Group>
<SimpleGrid cols={{ base: 1, sm: 2, lg: 4 }} spacing="lg"> <SimpleGrid cols={{ base: 1, sm: 2, lg: 4 }} spacing="lg">
@@ -185,12 +204,12 @@ function AppOverviewPage() {
<Group justify="space-between" mt="md"> <Group justify="space-between" mt="md">
<Stack gap={0}> <Stack gap={0}>
<Text size="xs" c="dimmed">Min. Version</Text> <Text size="xs" c="dimmed">Min. Version</Text>
<Text size="sm" fw={600}>{grid?.version?.mobile_minimum_version || '-'}</Text> <Text size="sm" fw={600}>{grid?.version?.mobile_minimum_version || ''}</Text>
</Stack> </Stack>
<Stack gap={0} align="flex-end"> <Stack gap={0} align="flex-end">
<Text size="xs" c="dimmed">Maintenance</Text> <Text size="xs" c="dimmed">Maintenance</Text>
<Badge size="sm" color={grid?.version?.mobile_maintenance === 'true' ? 'red' : 'gray'} variant="light"> <Badge size="sm" color={maintenanceOn ? 'orange' : 'teal'} variant="light">
{grid?.version?.mobile_maintenance?.toUpperCase() || 'FALSE'} {maintenanceOn ? 'On' : 'Off'}
</Badge> </Badge>
</Stack> </Stack>
</Group> </Group>
@@ -198,41 +217,50 @@ function AppOverviewPage() {
<SummaryCard <SummaryCard
title="Total Activity Today" title="Total Activity Today"
value={gridLoading ? '...' : (grid?.activity?.today?.toLocaleString() || '0')} value={gridLoading ? '...' : (grid?.activity?.today?.toLocaleString() ?? '0')}
icon={TbActivity} icon={TbActivity}
color="teal" color="teal"
trend={grid?.activity?.increase ? { value: `${grid.activity.increase}%`, positive: grid.activity.increase > 0 } : undefined} trend={grid?.activity?.increase != null && Number(grid.activity.increase) !== 0
? { value: `${grid.activity.increase}%`, positive: Number(grid.activity.increase) > 0 }
: undefined}
/> />
<SummaryCard <SummaryCard
title="Total Villages Active" title="Active Villages"
value={gridLoading ? '...' : (grid?.village?.active || '0')} value={gridLoading ? '...' : (grid?.village?.active ?? '0')}
icon={TbBuildingCommunity} icon={TbBuildingCommunity}
color="indigo" color="indigo"
onClick={() => navigate({ to: `/apps/${appId}/villages` })} onClick={() => navigate({ to: `/apps/${appId}/villages` })}
> >
<Group justify="space-between" mt="md"> <Group justify="space-between" mt="md">
<Text size="xs" c="dimmed">Nonactive Villages</Text> <Text size="xs" c="dimmed">Inactive</Text>
<Badge size="sm" color="red" variant="light">{grid?.village?.inactive || 0}</Badge> <Badge size="sm" color="red" variant="light">{grid?.village?.inactive ?? 0}</Badge>
</Group> </Group>
</SummaryCard> </SummaryCard>
<SummaryCard <SummaryCard
title="Errors Open" title="Open Errors"
value={appLoading ? '...' : (appData?.errors || '0')} value={appLoading ? '...' : (appData?.errors ?? 0)}
icon={TbAlertTriangle} icon={TbAlertTriangle}
color="red" color="red"
isError={true} isError
onClick={() => navigate({ to: `/apps/${appId}/errors` })} onClick={() => navigate({ to: `/apps/${appId}/errors` })}
/> />
</SimpleGrid> </SimpleGrid>
<Group justify="space-between" align="flex-end">
<Stack gap={2}>
<Title order={4}>Analytics</Title>
<Text size="sm" c="dimmed">Activity trends and village comparisons.</Text>
</Stack>
</Group>
<SimpleGrid cols={{ base: 1, lg: 2 }} spacing="lg"> <SimpleGrid cols={{ base: 1, lg: 2 }} spacing="lg">
<VillageActivityLineChart data={dailyData} isLoading={dailyLoading} /> <VillageActivityLineChart data={dailyData} isLoading={dailyLoading} range={dailyRange} onRangeChange={setDailyRange} />
<VillageComparisonBarChart data={comparisonData} isLoading={comparisonLoading} /> <VillageComparisonBarChart data={comparisonData} isLoading={comparisonLoading} range={comparisonRange} onRangeChange={setComparisonRange} />
</SimpleGrid> </SimpleGrid>
<ErrorDataTable appId={appId} /> <ErrorDataTable ref={errorTableRef} appId={appId} />
</Stack> </Stack>
</> </>
) )

View File

@@ -1,34 +1,33 @@
import { useState } from 'react' import { useEffect, useState } from 'react'
import useSWR from 'swr' import useSWR from 'swr'
import { import {
Badge,
Group,
Stack,
Text,
Title,
Paper,
Table,
TextInput,
ActionIcon, ActionIcon,
Avatar, Avatar,
Badge,
Code, Code,
Button, Group,
Box, Loader,
Pagination, Pagination,
ThemeIcon, Paper,
ScrollArea, ScrollArea,
Container, Select,
Stack,
Table,
Text,
TextInput,
Title,
Tooltip,
} from '@mantine/core' } from '@mantine/core'
import { useMediaQuery } from '@mantine/hooks' import { useDebouncedValue, useMediaQuery } from '@mantine/hooks'
import { DatePickerInput } from '@mantine/dates'
import { createFileRoute, useParams } from '@tanstack/react-router' import { createFileRoute, useParams } from '@tanstack/react-router'
import { import {
TbSearch, TbAlertCircle,
TbDownload,
TbX,
TbHistory,
TbCalendar, TbCalendar,
TbUser, TbHistory,
TbHome2 TbHome2,
TbSearch,
TbX,
} from 'react-icons/tb' } from 'react-icons/tb'
import { API_URLS } from '../config/api' import { API_URLS } from '../config/api'
@@ -47,26 +46,83 @@ interface LogEntry {
const fetcher = (url: string) => fetch(url).then((res) => res.json()) const fetcher = (url: string) => fetch(url).then((res) => res.json())
const ACTION_COLOR: Record<string, string> = {
LOGIN: 'teal',
LOGOUT: 'gray',
CREATE: 'blue',
UPDATE: 'yellow',
DELETE: 'red',
}
const ACTION_OPTIONS = [
{ value: 'LOGIN', label: 'Login' },
{ value: 'LOGOUT', label: 'Logout' },
{ value: 'CREATE', label: 'Create' },
{ value: 'UPDATE', label: 'Update' },
{ value: 'DELETE', label: 'Delete' },
]
function getActionColor(action: string) {
return ACTION_COLOR[action.toUpperCase()] ?? 'brand-blue'
}
function LogTimestamp({ value }: { value: string }) {
if (value.endsWith('lalu')) {
return <Text size="xs" fw={600}>{value}</Text>
}
const [time, ...dateParts] = value.split(' ')
return (
<Stack gap={0}>
<Text size="xs" fw={600}>{dateParts.join(' ')}</Text>
<Text size="xs" c="dimmed">{time}</Text>
</Stack>
)
}
function AppLogsPage() { function AppLogsPage() {
const { appId } = useParams({ from: '/apps/$appId/logs' }) const { appId } = useParams({ from: '/apps/$appId/logs' })
const [page, setPage] = useState(1) const [page, setPage] = useState(1)
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const [searchQuery, setSearchQuery] = useState('') const [searchQuery, setSearchQuery] = useState('')
const [debouncedSearch] = useDebouncedValue(search, 400)
const [filterAction, setFilterAction] = useState<string | null>(null)
const [filterVillageSearch, setFilterVillageSearch] = useState('')
const [filterVillageId, setFilterVillageId] = useState<string | null>(null)
const [dateRange, setDateRange] = useState<[string | null, string | null]>([null, null])
const isDesaPlus = appId === 'desa-plus' const isDesaPlus = appId === 'desa-plus'
const isMobile = useMediaQuery('(max-width: 768px)') const isMobile = useMediaQuery('(max-width: 768px)')
const apiUrl = isDesaPlus ? API_URLS.getLogsAllVillages(page, searchQuery) : null const [dateFrom, dateTo] = dateRange
const apiUrl = isDesaPlus
? API_URLS.getLogsAllVillages(
page,
searchQuery,
filterAction ?? undefined,
filterVillageId ?? undefined,
dateFrom ?? undefined,
dateTo ?? undefined,
)
: null
const { data: response, error, isLoading } = useSWR(apiUrl, fetcher) const { data: response, error, isLoading } = useSWR(apiUrl, fetcher)
const logs: LogEntry[] = response?.data?.log || [] const logs: LogEntry[] = response?.data?.log || []
const handleSearchChange = (val: string) => { const { data: filterVillagesResp } = useSWR(
setSearch(val) isDesaPlus && filterVillageSearch.length >= 1 ? API_URLS.getVillages(1, filterVillageSearch) : null,
if (val.length >= 3 || val.length === 0) { fetcher
setSearchQuery(val) )
const filterVillagesOptions = (filterVillagesResp?.data || []).map((v: any) => ({ value: v.id, label: v.name }))
useEffect(() => {
if (debouncedSearch.length >= 3 || debouncedSearch.length === 0) {
setSearchQuery(debouncedSearch)
setPage(1) setPage(1)
} }
} }, [debouncedSearch])
useEffect(() => {
setPage(1)
}, [filterAction, filterVillageId, dateFrom, dateTo])
const handleClearSearch = () => { const handleClearSearch = () => {
setSearch('') setSearch('')
@@ -74,162 +130,169 @@ function AppLogsPage() {
setPage(1) setPage(1)
} }
const getActionColor = (action: string) => {
const a = action.toUpperCase()
if (a === 'LOGIN') return 'blue'
if (a === 'LOGOUT') return 'gray'
if (a === 'CREATE') return 'teal'
if (a === 'UPDATE') return 'orange'
if (a === 'DELETE') return 'red'
return 'brand-blue'
}
if (!isDesaPlus) { if (!isDesaPlus) {
return ( return (
<Container size="xl" py="xl"> <Paper withBorder radius="2xl" className="glass" p="xl">
<Paper p="xl" radius="xl" className="glass" style={{ textAlign: 'center' }}> <Stack align="center" gap="xs" py="xl">
<TbHistory size={48} color="gray" opacity={0.5} /> <TbHistory size={36} style={{ opacity: 0.25 }} />
<Title order={3} mt="md">Activity Logs</Title> <Text fw={600} size="sm">Activity Logs Coming Soon</Text>
<Text c="dimmed">This feature is currently customized for Desa+. Other apps coming soon.</Text> <Text size="sm" c="dimmed">This feature is currently available for Desa+. Other apps coming soon.</Text>
</Paper> </Stack>
</Container> </Paper>
) )
} }
return ( return (
<Stack gap="xl" py="md"> <Stack gap="xl" py="md">
<Paper withBorder radius="2xl" p="xl" className="glass" style={{ borderLeft: '6px solid #7C3AED' }}> <Group justify="space-between" align="flex-start">
<Stack gap="lg"> <Stack gap={4}>
<Group justify="space-between" align="center"> <Title order={3}>Activity Logs</Title>
<Stack gap={4}> <Text size="sm" c="dimmed">
<Group gap="xs"> {isLoading
<ThemeIcon variant="light" color="violet" size="lg" radius="md"> ? 'Loading logs...'
<TbHistory size={22} /> : `${(response?.data?.total ?? 0).toLocaleString()} events across all villages`}
</ThemeIcon> </Text>
<Title order={3}>Activity Logs</Title> </Stack>
</Group> </Group>
<Text size="sm" c="dimmed" ml={40}>
{isLoading ? 'Loading logs...' : `Auditing ${response?.data?.total || 0} events across all villages`}
</Text>
</Stack>
{/* <Button
variant="light"
color="gray"
leftSection={<TbDownload size={18} />}
radius="md"
size="md"
>
Export
</Button> */}
</Group>
<Paper withBorder p="md" className="glass">
<Stack gap="sm">
<TextInput <TextInput
placeholder="Search action or village..." placeholder="Search by user name or village..."
leftSection={<TbSearch size={18} />} leftSection={<TbSearch size={16} />}
size="md" size="sm"
rightSection={ rightSection={
search ? ( search ? (
<ActionIcon variant="transparent" color="gray" onClick={handleClearSearch} size="md"> <Tooltip label="Clear search" withArrow>
<TbX size={18} /> <ActionIcon variant="transparent" color="gray" onClick={handleClearSearch} size="sm">
</ActionIcon> <TbX size={16} />
</ActionIcon>
</Tooltip>
) : null ) : null
} }
value={search} value={search}
onChange={(e) => handleSearchChange(e.currentTarget.value)} onChange={(e) => setSearch(e.currentTarget.value)}
radius="md" radius="md"
style={{ maxWidth: 500 }}
ml={40}
/> />
<Group gap="sm" wrap="nowrap">
<Select
size="sm"
placeholder="All actions"
data={ACTION_OPTIONS}
value={filterAction}
onChange={setFilterAction}
radius="md"
clearable
style={{ flex: 1 }}
/>
<Select
size="sm"
placeholder="Search village..."
searchable
onSearchChange={setFilterVillageSearch}
data={filterVillagesOptions}
value={filterVillageId}
onChange={setFilterVillageId}
radius="md"
clearable
style={{ flex: 1 }}
/>
<DatePickerInput
type="range"
size="sm"
placeholder="Date range"
leftSection={<TbCalendar size={16} />}
value={dateRange}
onChange={setDateRange}
radius="md"
clearable
style={{ flex: 1 }}
maxDate={new Date()}
/>
</Group>
</Stack> </Stack>
</Paper> </Paper>
{isLoading ? ( {isLoading ? (
<Paper p="xl" radius="xl" withBorder style={{ textAlign: 'center' }}> <Group justify="center" py="xl">
<Text c="dimmed">Fetching activity logs...</Text> <Loader type="dots" />
</Paper> </Group>
) : error ? ( ) : error ? (
<Paper p="xl" radius="xl" withBorder style={{ textAlign: 'center' }}> <Paper withBorder radius="2xl" className="glass" p="md">
<Text c="red">Failed to load logs from API.</Text> <Stack align="center" gap="xs" py="xl">
<TbAlertCircle size={32} style={{ opacity: 0.4, color: 'var(--mantine-color-red-6)' }} />
<Text size="sm" c="dimmed">Failed to load logs from the API.</Text>
</Stack>
</Paper> </Paper>
) : logs.length === 0 ? ( ) : logs.length === 0 ? (
<Paper p="xl" radius="xl" withBorder style={{ textAlign: 'center' }}> <Paper withBorder radius="2xl" className="glass" p="md">
<TbHistory size={40} color="gray" opacity={0.4} /> <Stack align="center" gap="xs" py="xl">
<Text c="dimmed" mt="md">No activity found for this search.</Text> <TbHistory size={32} style={{ opacity: 0.25 }} />
<Text size="sm" c="dimmed">
{searchQuery || filterAction || filterVillageId || dateFrom ? 'No activity found for this filter.' : 'No activity logs yet.'}
</Text>
</Stack>
</Paper> </Paper>
) : ( ) : (
<Paper withBorder radius="2xl" className="glass" style={{ overflow: 'hidden' }}> <Paper withBorder radius="2xl" className="glass" style={{ overflow: 'hidden' }}>
<ScrollArea h={isMobile ? undefined : 'auto'} offsetScrollbars> <ScrollArea h={isMobile ? undefined : 'auto'} offsetScrollbars>
<Table <Table
verticalSpacing="lg" className="data-table"
horizontalSpacing="xl" verticalSpacing="sm"
highlightOnHover horizontalSpacing="lg"
highlightOnHover
withColumnBorders={false} withColumnBorders={false}
style={{ style={{
tableLayout: isMobile ? 'auto' : 'fixed', tableLayout: isMobile ? 'auto' : 'fixed',
width: '100%', width: '100%',
minWidth: isMobile ? 900 : 'unset' minWidth: isMobile ? 900 : 'unset',
}} }}
> >
<Table.Thead bg="rgba(0,0,0,0.05)"> <Table.Thead>
<Table.Tr> <Table.Tr>
<Table.Th style={{ border: 'none', width: isMobile ? undefined : '15%' }}>Timestamp</Table.Th> <Table.Th style={{ width: isMobile ? undefined : '18%' }}>Timestamp</Table.Th>
<Table.Th style={{ border: 'none', width: isMobile ? undefined : '20%' }}>User & Village</Table.Th> <Table.Th style={{ width: isMobile ? undefined : '22%' }}>User & Village</Table.Th>
<Table.Th style={{ border: 'none', width: isMobile ? undefined : '15%' }}>Action</Table.Th> <Table.Th style={{ width: isMobile ? undefined : '14%' }}>Action</Table.Th>
<Table.Th style={{ border: 'none', width: isMobile ? undefined : '40%' }}>Description</Table.Th> <Table.Th>Description</Table.Th>
</Table.Tr> </Table.Tr>
</Table.Thead> </Table.Thead>
<Table.Tbody> <Table.Tbody>
{logs.map((log) => ( {logs.map((log) => (
<Table.Tr key={log.id} style={{ borderBottom: '1px solid rgba(255,255,255,0.05)' }}> <Table.Tr key={log.id}>
<Table.Td> <Table.Td>
<Group gap={8} wrap="nowrap" align="flex-start"> <LogTimestamp value={log.createdAt} />
<ThemeIcon variant="transparent" color="gray" size="sm">
<TbCalendar size={14} />
</ThemeIcon>
{log.createdAt.endsWith('lalu') ? (
<Text size="xs" fw={700}>{log.createdAt}</Text>
) : (
<Stack gap={0}>
<Text size="xs" fw={700}>
{log.createdAt.split(' ').slice(1).join(' ')}
</Text>
<Text size="xs" c="dimmed">
{log.createdAt.split(' ')[0]}
</Text>
</Stack>
)}
</Group>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Stack gap={4} style={{ overflow: 'hidden' }}> <Stack gap={4} style={{ overflow: 'hidden' }}>
<Group gap={8} wrap="nowrap"> <Group gap={6} wrap="nowrap">
<Avatar size="xs" radius="xl" color="brand-blue" variant="light"> <Avatar size="xs" radius="xl" color="brand-blue" variant="light">
{log.username.charAt(0)} {log.username.charAt(0)}
</Avatar> </Avatar>
<Text size="xs" fw={700} truncate="end">{log.username}</Text> <Text size="xs" fw={600} truncate="end">{log.username}</Text>
</Group> </Group>
<Group gap={8} wrap="nowrap"> <Group gap={6} wrap="nowrap">
<TbHome2 size={12} color="gray" /> <TbHome2 size={12} color="gray" />
<Text size="xs" c="dimmed" truncate="end">{log.village}</Text> <Text size="xs" c="dimmed" truncate="end">{log.village}</Text>
</Group> </Group>
</Stack> </Stack>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Badge <Badge
variant="dot" variant="light"
color={getActionColor(log.action)} color={getActionColor(log.action)}
radius="sm" size="sm"
size="xs" tt="capitalize"
styles={{
root: { fontWeight: 800 },
label: { textOverflow: 'clip', overflow: 'visible' }
}}
> >
{log.action} {log.action}
</Badge> </Badge>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Code color="brand-blue" bg="rgba(37, 99, 235, 0.05)" fw={600} style={{ fontSize: '11px', display: 'block', whiteSpace: 'normal' }}> <Code
color="brand-blue"
bg="rgba(37, 99, 235, 0.05)"
fw={600}
style={{ fontSize: 11, display: 'block', whiteSpace: 'normal' }}
>
{log.desc} {log.desc}
</Code> </Code>
</Table.Td> </Table.Td>
@@ -241,12 +304,13 @@ function AppLogsPage() {
</Paper> </Paper>
)} )}
{!isLoading && !error && response?.data?.totalPage > 0 && ( {!isLoading && !error && response?.data?.totalPage > 1 && (
<Group justify="center" mt="xl"> <Group justify="center">
<Pagination <Pagination
value={page} value={page}
onChange={setPage} onChange={setPage}
total={response.data.totalPage} total={response.data.totalPage}
size="sm"
radius="md" radius="md"
withEdges={false} withEdges={false}
siblings={1} siblings={1}

View File

@@ -1,38 +1,101 @@
import { DashboardLayout } from '@/frontend/components/DashboardLayout' import { DashboardLayout } from '@/frontend/components/DashboardLayout'
import { APP_CONFIGS } from '@/frontend/config/appMenus'
import { import {
Badge,
Box, Box,
Container, Container,
Divider, Divider,
Group, Group,
Skeleton,
Stack, Stack,
Text, Text,
Title Title,
} from '@mantine/core' } from '@mantine/core'
import { createFileRoute, Outlet, useNavigate, useParams } from '@tanstack/react-router' import { useQuery } from '@tanstack/react-query'
import { createFileRoute, Outlet, useParams } from '@tanstack/react-router'
import { TbAlertTriangle, TbTools } from 'react-icons/tb'
export const Route = createFileRoute('/apps/$appId')({ export const Route = createFileRoute('/apps/$appId')({
component: AppDetailLayout, component: AppDetailLayout,
}) })
const STATUS_COLOR: Record<string, string> = {
active: 'teal',
warning: 'orange',
error: 'red',
}
const STATUS_LABEL: Record<string, string> = {
active: 'Active',
warning: 'Warning',
error: 'Error',
}
function AppDetailLayout() { function AppDetailLayout() {
const { appId } = useParams({ from: '/apps/$appId' }) const { appId } = useParams({ from: '/apps/$appId' })
const navigate = useNavigate()
// Format app ID for display (e.g., desa-plus -> Desa+) const { data: appData, isLoading } = useQuery({
const appName = appId queryKey: ['apps', appId],
.split('-') queryFn: () => fetch(`/api/apps/${appId}`).then((r) => r.json()),
.map(word => word.charAt(0).toUpperCase() + word.slice(1)) staleTime: 30_000,
.join(' ') })
.replace('Plus', '+')
const configName = APP_CONFIGS[appId]?.name
const displayName = appData?.name ?? configName ?? appId
const statusKey = appData?.maintenance ? 'maintenance' : (appData?.status ?? 'active')
const statusColor = appData?.maintenance ? 'gray' : (STATUS_COLOR[appData?.status] ?? 'gray')
const statusLabel = appData?.maintenance ? 'Maintenance' : (STATUS_LABEL[appData?.status] ?? appData?.status)
return ( return (
<DashboardLayout> <DashboardLayout>
<Container size="xl" py="lg"> <Container size="xl" py="lg">
<Stack gap="md"> <Stack gap="md">
<Group justify="space-between" align="flex-end"> <Group justify="space-between" align="flex-start">
<Stack gap={4}> <Stack gap={6}>
<Title order={1} className="gradient-text" style={{ fontSize: '2.5rem' }}>{appName}</Title> <Group gap="sm" align="center">
<Text c="dimmed" size="sm" fw={500}>Application ID: <span style={{ fontFamily: 'monospace' }}>{appId}</span></Text> {isLoading ? (
<Skeleton height={36} width={180} radius="md" />
) : (
<Title order={2} className="gradient-text">{displayName}</Title>
)}
{!isLoading && appData && (
<Badge color={statusColor} variant="dot" size="md">
{statusLabel}
</Badge>
)}
</Group>
<Group gap="xs" align="center">
<Text size="xs" c="dimmed" fw={500} style={{ fontFamily: 'monospace' }}>
{appId}
</Text>
{isLoading ? (
<Skeleton height={20} width={60} radius="xl" />
) : (
<>
{(appData?.errors ?? 0) > 0 && (
<Badge
variant="light"
color="red"
size="sm"
leftSection={<TbAlertTriangle size={10} />}
>
{appData.errors} open {appData.errors === 1 ? 'error' : 'errors'}
</Badge>
)}
{appData?.maintenance && (
<Badge
variant="light"
color="orange"
size="sm"
leftSection={<TbTools size={10} />}
>
Maintenance mode
</Badge>
)}
</>
)}
</Group>
</Stack> </Stack>
</Group> </Group>

File diff suppressed because it is too large Load Diff

View File

@@ -1,23 +1,30 @@
import { AreaChart } from '@mantine/charts' import { AreaChart } from '@mantine/charts'
import { import {
Badge,
Box, Box,
Button, Button,
Card, Card,
Grid,
Group, Group,
Loader,
Modal, Modal,
Paper, Paper,
SegmentedControl, SegmentedControl,
SimpleGrid, SimpleGrid,
Stack, Stack,
Switch,
Table,
Text, Text,
Textarea, Textarea,
TextInput, TextInput,
ThemeIcon, ThemeIcon,
Title Title,
} from '@mantine/core' } from '@mantine/core'
import { useDisclosure } from '@mantine/hooks' import { useDisclosure } from '@mantine/hooks'
import { DatePickerInput, type DatesRangeValue } from '@mantine/dates'
import { notifications } from '@mantine/notifications' import { notifications } from '@mantine/notifications'
import { createFileRoute, useNavigate, useParams } from '@tanstack/react-router' import { createFileRoute, useNavigate, useParams } from '@tanstack/react-router'
import dayjs from 'dayjs'
import { useState } from 'react' import { useState } from 'react'
import { import {
TbArrowLeft, TbArrowLeft,
@@ -25,11 +32,13 @@ import {
TbCalendar, TbCalendar,
TbCalendarEvent, TbCalendarEvent,
TbChartBar, TbChartBar,
TbClock,
TbEdit, TbEdit,
TbHome2, TbHome2,
TbLayoutKanban, TbLayoutKanban,
TbMapPin, TbMapPin,
TbPower, TbPower,
TbTestPipe,
TbUser, TbUser,
TbUsers, TbUsers,
TbUsersGroup, TbUsersGroup,
@@ -61,11 +70,17 @@ type ChartPeriod = 'daily' | 'monthly' | 'yearly'
function ActivityChart({ villageId }: { villageId: string }) { function ActivityChart({ villageId }: { villageId: string }) {
const [period, setPeriod] = useState<ChartPeriod>('daily') const [period, setPeriod] = useState<ChartPeriod>('daily')
const [dateRange, setDateRange] = useState<DatesRangeValue>([null, null])
const { data: response, isLoading } = useSWR( const dateFrom = dateRange[0] ? dayjs(dateRange[0]).format('YYYY-MM-DD') : undefined
API_URLS.graphLogVillages(villageId, period), const dateTo = dateRange[1] ? dayjs(dateRange[1]).format('YYYY-MM-DD') : undefined
fetcher const hasCustomRange = !!(dateFrom && dateTo)
)
const apiUrl = hasCustomRange
? API_URLS.graphLogVillages(villageId, period, dateFrom, dateTo)
: API_URLS.graphLogVillages(villageId, period)
const { data: response, isLoading } = useSWR(apiUrl, fetcher)
const labels: Record<ChartPeriod, string> = { const labels: Record<ChartPeriod, string> = {
daily: 'Daily (last 14 days)', daily: 'Daily (last 14 days)',
@@ -75,7 +90,6 @@ function ActivityChart({ villageId }: { villageId: string }) {
const rawData: any[] = Array.isArray(response?.data) ? response.data : [] const rawData: any[] = Array.isArray(response?.data) ? response.data : []
// Normalize: map any field names from external API → { label, activity }
const data = rawData.map((item) => { const data = rawData.map((item) => {
const label = item.label const label = item.label
const activity = item.aktivitas const activity = item.aktivitas
@@ -91,26 +105,42 @@ function ActivityChart({ villageId }: { villageId: string }) {
</ThemeIcon> </ThemeIcon>
<Stack gap={0}> <Stack gap={0}>
<Text fw={700} size="sm">Village Activity Log</Text> <Text fw={700} size="sm">Village Activity Log</Text>
<Text size="xs" c="dimmed">{labels[period]}</Text> <Text size="xs" c="dimmed">
{hasCustomRange ? `${dateFrom}${dateTo}` : labels[period]}
</Text>
</Stack> </Stack>
</Group> </Group>
<SegmentedControl <Group gap="sm" wrap="wrap">
value={period} <DatePickerInput
onChange={(v) => setPeriod(v as ChartPeriod)} type="range"
size="xs" placeholder="Pick date range"
radius="md" size="xs"
data={[ radius="md"
{ value: 'daily', label: 'Daily' }, value={dateRange}
{ value: 'monthly', label: 'Monthly' }, onChange={setDateRange}
{ value: 'yearly', label: 'Yearly' }, clearable
]} w={200}
/> />
{!hasCustomRange && (
<SegmentedControl
value={period}
onChange={(v) => setPeriod(v as ChartPeriod)}
size="xs"
radius="md"
data={[
{ value: 'daily', label: 'Daily' },
{ value: 'monthly', label: 'Monthly' },
{ value: 'yearly', label: 'Yearly' },
]}
/>
)}
</Group>
</Group> </Group>
{isLoading ? ( {isLoading ? (
<Stack h={280} align="center" justify="center"> <Stack h={280} align="center" justify="center">
<Text size="sm" c="dimmed">Loading chart data...</Text> <Loader type="dots" />
</Stack> </Stack>
) : ( ) : (
<AreaChart <AreaChart
@@ -119,16 +149,44 @@ function ActivityChart({ villageId }: { villageId: string }) {
dataKey="label" dataKey="label"
series={[{ name: 'activity', color: '#2563EB' }]} series={[{ name: 'activity', color: '#2563EB' }]}
curveType="monotone" curveType="monotone"
withTooltip={true} withTooltip
withDots={true} withDots
withPointLabels={false} withPointLabels={false}
tickLine="none"
gridAxis="x"
fillOpacity={0.4}
tooltipAnimationDuration={150} tooltipAnimationDuration={150}
tooltipProps={{ tooltipProps={{
allowEscapeViewBox: { x: true, y: false }, content: ({ active, payload, label }: any) => {
if (!active || !payload?.length) return null
return (
<div style={{
backgroundColor: '#1A1B1E',
padding: '8px 12px',
borderRadius: '6px',
border: '1px solid #373A40',
boxShadow: '0 4px 12px rgba(0,0,0,0.5)',
pointerEvents: 'none',
whiteSpace: 'nowrap',
}}>
<div style={{ fontSize: '12px', fontWeight: 600, color: '#C1C2C5', marginBottom: '4px' }}>
{label}
</div>
<div style={{ fontSize: '11px', color: '#2563EB' }}>
Activity: <span style={{ fontWeight: 700 }}>{payload[0].value}</span>
</div>
</div>
)
},
}} }}
activeDotProps={{ activeDotProps={{ r: 6, strokeWidth: 2 }}
r: 6, styles={{
strokeWidth: 2, root: {
'.recharts-area-curve': {
strokeWidth: 3,
filter: 'drop-shadow(0 4px 8px rgba(37, 99, 235, 0.3))',
},
},
}} }}
/> />
)} )}
@@ -136,6 +194,66 @@ function ActivityChart({ villageId }: { villageId: string }) {
) )
} }
// ── Recent Activity Logs ──────────────────────────────────────────────────────
function RecentVillageLogs({ villageId }: { villageId: string }) {
const { data: response, isLoading } = useSWR(API_URLS.getRecentVillageLogs(villageId), fetcher)
const logs: any[] = Array.isArray(response?.data) ? response.data : []
return (
<Paper withBorder radius="xl" p="lg">
<Group gap="xs" mb="md">
<ThemeIcon size={28} radius="md" variant="light" color="teal">
<TbClock size={14} />
</ThemeIcon>
<Stack gap={0}>
<Text fw={700} size="sm">Recent Activity</Text>
<Text size="xs" c="dimmed">Latest user actions in this village</Text>
</Stack>
</Group>
{isLoading ? (
<Stack h={120} align="center" justify="center">
<Loader type="dots" />
</Stack>
) : logs.length === 0 ? (
<Text size="sm" c="dimmed" ta="center" py="md">No recent activity.</Text>
) : (
<Table.ScrollContainer minWidth={380}>
<Table verticalSpacing="xs" className="data-table">
<Table.Thead>
<Table.Tr>
<Table.Th style={{ whiteSpace: 'nowrap' }}>Time</Table.Th>
<Table.Th>User</Table.Th>
<Table.Th style={{ whiteSpace: 'nowrap' }}>Action</Table.Th>
<Table.Th>Description</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{logs.map((log: any, i: number) => (
<Table.Tr key={i}>
<Table.Td style={{ whiteSpace: 'nowrap' }}>
<Text size="xs">{dayjs(log.timestamp).format('D MMM YYYY, HH:mm')}</Text>
</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>{log.userName || 'Unknown'}</Text>
</Table.Td>
<Table.Td style={{ whiteSpace: 'nowrap' }}>
<Text size="xs">{log.action || '-'}</Text>
</Table.Td>
<Table.Td>
<Text size="xs" c="dimmed">{log.desc || '-'}</Text>
</Table.Td>
</Table.Tr>
))}
</Table.Tbody>
</Table>
</Table.ScrollContainer>
)}
</Paper>
)
}
// ── Main Page ───────────────────────────────────────────────────────────────── // ── Main Page ─────────────────────────────────────────────────────────────────
function VillageDetailPage() { function VillageDetailPage() {
@@ -152,7 +270,7 @@ function VillageDetailPage() {
const [editModalOpened, { open: openEditModal, close: closeEditModal }] = useDisclosure(false) const [editModalOpened, { open: openEditModal, close: closeEditModal }] = useDisclosure(false)
const [isUpdating, setIsUpdating] = useState(false) const [isUpdating, setIsUpdating] = useState(false)
const [isEditing, setIsEditing] = useState(false) const [isEditing, setIsEditing] = useState(false)
const [editForm, setEditForm] = useState({ name: '', desc: '' }) const [editForm, setEditForm] = useState({ name: '', desc: '', isDummy: false })
const village = infoRes?.data const village = infoRes?.data
const stats = gridRes?.data const stats = gridRes?.data
@@ -160,7 +278,8 @@ function VillageDetailPage() {
const openEdit = () => { const openEdit = () => {
setEditForm({ setEditForm({
name: village?.name || '', name: village?.name || '',
desc: village?.desc || '' desc: village?.desc || '',
isDummy: village?.isDummy ?? false,
}) })
openEditModal() openEditModal()
} }
@@ -187,7 +306,8 @@ function VillageDetailPage() {
body: JSON.stringify({ body: JSON.stringify({
id: village.id, id: village.id,
name: editForm.name, name: editForm.name,
desc: editForm.desc desc: editForm.desc,
isDummy: editForm.isDummy,
}) })
}) })
@@ -195,7 +315,7 @@ function VillageDetailPage() {
await fetch(API_URLS.createLog(), { await fetch(API_URLS.createLog(), {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ type: 'UPDATE', message: `Data desa (${appId}) diperbarui: ${editForm.name}-${village.id}` }) body: JSON.stringify({ type: 'UPDATE', message: `Village data updated (${appId}): ${editForm.name} - ${village.id}` })
}).catch(console.error) }).catch(console.error)
notifications.show({ notifications.show({
@@ -212,7 +332,7 @@ function VillageDetailPage() {
color: 'red' color: 'red'
}) })
} }
} catch (error) { } catch {
notifications.show({ notifications.show({
title: 'Error', title: 'Error',
message: 'A network error occurred.', message: 'A network error occurred.',
@@ -243,7 +363,7 @@ function VillageDetailPage() {
await fetch(API_URLS.createLog(), { await fetch(API_URLS.createLog(), {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ type: 'UPDATE', message: `Status desa (${appId}) diperbarui (${!village.isActive ? 'activated' : 'deactivated'}): ${village.name}-${village.id}` }) body: JSON.stringify({ type: 'UPDATE', message: `Village status updated (${appId}): ${village.name} ${!village.isActive ? 'activated' : 'deactivated'} - ${village.id}` })
}).catch(console.error) }).catch(console.error)
notifications.show({ notifications.show({
@@ -260,7 +380,7 @@ function VillageDetailPage() {
color: 'red' color: 'red'
}) })
} }
} catch (error) { } catch {
notifications.show({ notifications.show({
title: 'Error', title: 'Error',
message: 'A network error occurred.', message: 'A network error occurred.',
@@ -275,9 +395,9 @@ function VillageDetailPage() {
if (infoLoading || gridLoading) { if (infoLoading || gridLoading) {
return ( return (
<Stack align="center" py="xl" gap="md"> <Group justify="center" py="xl">
<Text c="dimmed">Loading village data...</Text> <Loader type="dots" />
</Stack> </Group>
) )
} }
@@ -321,7 +441,7 @@ function VillageDetailPage() {
loading={isUpdating} loading={isUpdating}
disabled={!isDeveloper} disabled={!isDeveloper}
> >
{village.isActive ? 'Deactivate' : 'Active'} {village.isActive ? 'Deactivate' : 'Activate'}
</Button> </Button>
<Button <Button
variant="light" variant="light"
@@ -360,7 +480,20 @@ function VillageDetailPage() {
</ThemeIcon> </ThemeIcon>
<Stack gap={6}> <Stack gap={6}>
<Title order={2} style={{ color: 'white', lineHeight: 1.1 }}>{village.name}</Title> <Group gap="xs" align="center">
<Title order={2} style={{ color: 'white', lineHeight: 1.1 }}>{village.name}</Title>
{village.isDummy && (
<Badge
size="sm"
variant="light"
color="yellow"
leftSection={<TbTestPipe size={11} />}
style={{ textTransform: 'none' }}
>
Dummy
</Badge>
)}
</Group>
<Group gap={6}> <Group gap={6}>
<TbMapPin size={14} color="rgba(255,255,255,0.8)" /> <TbMapPin size={14} color="rgba(255,255,255,0.8)" />
@@ -427,58 +560,55 @@ function VillageDetailPage() {
))} ))}
</SimpleGrid> </SimpleGrid>
{/* ── Chart + Info Panels ── */} {/* ── Activity Chart ── */}
<Box <ActivityChart villageId={villageId} />
style={{
display: 'grid',
gridTemplateColumns: '3fr 1fr',
gap: '1rem',
alignItems: 'start',
}}
>
{/* Left (3/4): Activity Chart */}
<Box style={{ minWidth: 0 }}>
<ActivityChart villageId={villageId} />
</Box>
{/* Right (1/4): Informasi Sistem */} {/* ── Recent Logs + System Info ── */}
<Paper withBorder radius="xl" p="lg"> <Grid gutter="md" align="flex-start">
<Group gap="xs" mb="md"> <Grid.Col span={{ base: 12, md: 8 }}>
<ThemeIcon size={28} radius="md" variant="light" color="teal"> <RecentVillageLogs villageId={villageId} />
<TbCalendar size={14} /> </Grid.Col>
</ThemeIcon>
<Text fw={700} size="sm">System Information</Text> <Grid.Col span={{ base: 12, md: 4 }}>
</Group> <Paper withBorder radius="xl" p="lg">
<Stack gap={0}> <Group gap="xs" mb="md">
{[ <ThemeIcon size={28} radius="md" variant="light" color="teal">
{ label: 'Date Created', value: village.createdAt }, <TbCalendar size={14} />
{ label: 'Created By', value: '-' }, </ThemeIcon>
{ label: 'Last Updated', value: village.updatedAt }, <Text fw={700} size="sm">System Information</Text>
].map((item, idx, arr) => ( </Group>
<Group <Stack gap={0}>
key={item.label} {[
justify="space-between" { label: 'Date Created', value: village.createdAt },
py="xs" { label: 'Created By', value: '-' },
wrap="wrap" { label: 'Last Updated', value: village.updatedAt },
style={{ ].map((item, idx, arr) => (
borderBottom: idx < arr.length - 1 ? '1px solid var(--mantine-color-default-border)' : 'none', <Group
}} key={item.label}
> justify="space-between"
<Text size="xs" c="dimmed">{item.label}</Text> py="xs"
<Text size="xs" fw={600} ta="right">{item.value}</Text> wrap="wrap"
</Group> style={{
))} borderBottom: idx < arr.length - 1 ? '1px solid var(--mantine-color-default-border)' : 'none',
</Stack> }}
</Paper> >
</Box> <Text size="xs" c="dimmed">{item.label}</Text>
<Text size="xs" fw={600} ta="right">{item.value}</Text>
</Group>
))}
</Stack>
</Paper>
</Grid.Col>
</Grid>
{/* ── Confirmation Modal ── */} {/* ── Confirmation Modal ── */}
<Modal <Modal
opened={confirmModalOpened} opened={confirmModalOpened}
onClose={closeConfirmModal} onClose={closeConfirmModal}
title={<Text fw={700}>Confirm Status Change</Text>} radius="md"
radius="xl" title={<Text fw={700} size="lg">Confirm Status Change</Text>}
centered centered
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
<Stack gap="md"> <Stack gap="md">
<Text size="sm"> <Text size="sm">
@@ -505,7 +635,7 @@ function VillageDetailPage() {
opened={editModalOpened} opened={editModalOpened}
onClose={closeEditModal} onClose={closeEditModal}
title={<Text fw={700}>Edit Village Details</Text>} title={<Text fw={700}>Edit Village Details</Text>}
radius="xl" radius="md"
size="md" size="md"
> >
<Stack gap="md"> <Stack gap="md">
@@ -524,6 +654,12 @@ function VillageDetailPage() {
value={editForm.desc} value={editForm.desc}
onChange={(e) => setEditForm(prev => ({ ...prev, desc: e.currentTarget.value }))} onChange={(e) => setEditForm(prev => ({ ...prev, desc: e.currentTarget.value }))}
/> />
<Switch
label="Dummy Village"
description="Tandai desa ini sebagai data dummy"
checked={editForm.isDummy}
onChange={(e) => setEditForm(prev => ({ ...prev, isDummy: e.currentTarget.checked }))}
/>
<Group justify="flex-end" gap="sm" mt="md"> <Group justify="flex-end" gap="sm" mt="md">
<Button variant="light" color="gray" onClick={closeEditModal} radius="md"> <Button variant="light" color="gray" onClick={closeEditModal} radius="md">
Cancel Cancel

View File

@@ -36,6 +36,7 @@ import {
TbMapPin, TbMapPin,
TbPlus, TbPlus,
TbSearch, TbSearch,
TbTestPipe,
TbUser, TbUser,
TbX, TbX,
} from 'react-icons/tb' } from 'react-icons/tb'
@@ -50,6 +51,7 @@ interface APIVillage {
id: string id: string
name: string name: string
isActive: boolean isActive: boolean
isDummy: boolean
createdAt: string createdAt: string
perbekel: string | null perbekel: string | null
} }
@@ -95,9 +97,16 @@ function VillageGridCard({ village, onClick }: { village: APIVillage; onClick: (
> >
<TbHome2 size={22} /> <TbHome2 size={22} />
</ThemeIcon> </ThemeIcon>
<Badge color={cfg.color} variant="light" radius="sm" size="sm"> <Group gap={6}>
{cfg.label} {village.isDummy && (
</Badge> <Badge color="yellow" variant="light" radius="sm" size="sm" leftSection={<TbTestPipe size={11} />}>
Dummy
</Badge>
)}
<Badge color={cfg.color} variant="light" radius="sm" size="sm">
{cfg.label}
</Badge>
</Group>
</Group> </Group>
<Text fw={800} size="lg" mb={2}> <Text fw={800} size="lg" mb={2}>
@@ -175,6 +184,11 @@ function VillageListRow({ village, onClick }: { village: APIVillage; onClick: ()
<Stack gap={2}> <Stack gap={2}>
<Group gap="sm"> <Group gap="sm">
<Text fw={700} size="sm">{village.name}</Text> <Text fw={700} size="sm">{village.name}</Text>
{village.isDummy && (
<Badge color="yellow" variant="light" radius="sm" size="xs" leftSection={<TbTestPipe size={10} />}>
Dummy
</Badge>
)}
<Badge color={cfg.color} variant="light" radius="sm" size="xs"> <Badge color={cfg.color} variant="light" radius="sm" size="xs">
{cfg.label} {cfg.label}
</Badge> </Badge>
@@ -408,7 +422,7 @@ function AppVillagesIndexPage() {
<Select <Select
label="Gender" label="Gender"
placeholder="Select gender" placeholder="Select gender"
data={['Male', 'Female']} data={[{ label: 'Male', value: 'M' }, { label: 'Female', value: 'F' }]}
mt="sm" mt="sm"
required required
value={form.gender} value={form.gender}

File diff suppressed because it is too large Load Diff

View File

@@ -14,10 +14,11 @@ import {
Table, Table,
Text, Text,
Title, Title,
Tooltip,
} from '@mantine/core' } from '@mantine/core'
import { useQuery } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query'
import { createFileRoute, Link, redirect } from '@tanstack/react-router' import { createFileRoute, Link, redirect } from '@tanstack/react-router'
import { TbApps, TbChevronRight, TbMessageReport, TbUsers } from 'react-icons/tb' import { TbAlertCircle, TbApps, TbChevronRight, TbMessageReport, TbUsers } from 'react-icons/tb'
export const Route = createFileRoute('/dashboard')({ export const Route = createFileRoute('/dashboard')({
beforeLoad: async ({ context }) => { beforeLoad: async ({ context }) => {
@@ -35,6 +36,39 @@ export const Route = createFileRoute('/dashboard')({
component: DashboardPage, component: DashboardPage,
}) })
function getGreeting() {
const hour = new Date().getHours()
if (hour < 12) return 'Good morning'
if (hour < 17) return 'Good afternoon'
return 'Good evening'
}
function formatTimeAgo(dateStr: string) {
const diff = new Date().getTime() - new Date(dateStr).getTime()
const minutes = Math.floor(diff / 60000)
if (minutes < 1) return 'Just now'
if (minutes < 60) return `${minutes}m ago`
const hours = Math.floor(minutes / 60)
if (hours < 24) return `${hours}h ago`
const days = Math.floor(hours / 24)
if (days === 1) return 'Yesterday'
if (days < 7) return `${days}d ago`
return new Date(dateStr).toLocaleDateString('en-GB', { day: 'numeric', month: 'short', year: 'numeric' })
}
const SEVERITY_COLOR: Record<string, string> = {
OPEN: 'red',
IN_PROGRESS: 'blue',
ON_HOLD: 'orange',
RESOLVED: 'teal',
RELEASED: 'green',
CLOSED: 'gray',
}
function formatSeverityLabel(s: string) {
return s.replace(/_/g, ' ')
}
function DashboardPage() { function DashboardPage() {
const { data: sessionData } = useSession() const { data: sessionData } = useSession()
const user = sessionData?.user const user = sessionData?.user
@@ -54,34 +88,42 @@ function DashboardPage() {
queryFn: () => fetch('/api/dashboard/recent-errors').then((r) => r.json()), queryFn: () => fetch('/api/dashboard/recent-errors').then((r) => r.json()),
}) })
const formatTimeAgo = (dateStr: string) => { const today = new Date().toLocaleDateString('en-GB', {
const diff = new Date().getTime() - new Date(dateStr).getTime() weekday: 'long',
const minutes = Math.floor(diff / 60000) day: 'numeric',
if (minutes < 60) return `${minutes || 1} mins ago` month: 'long',
const hours = Math.floor(minutes / 60) year: 'numeric',
if (hours < 24) return `${hours} hours ago` })
return `${Math.floor(hours / 24)} days ago`
} const firstName = user?.name?.split(' ')[0] ?? user?.name
return ( return (
<DashboardLayout> <DashboardLayout>
<Container size="xl" py="lg"> <Container size="xl" py="lg">
<Stack gap="xl"> <Stack gap="xl">
<Group justify="space-between" align="center"> <Group justify="space-between" align="flex-start">
<Stack gap={0}> <Stack gap={4}>
<Title order={2} className="gradient-text">Overview Dashboard</Title> <Text size="xs" c="dimmed" fw={500} tt="uppercase" style={{ letterSpacing: '0.05em' }}>
<Text size="sm" c="dimmed">Welcome back, {user?.name}. Here is what's happening today.</Text> {today}
</Text>
<Title order={2} className="gradient-text">
{getGreeting()}, {firstName}.
</Title>
<Text size="sm" c="dimmed">
Here's a real-time overview of all your monitored applications.
</Text>
</Stack> </Stack>
{/* <Button <Button
variant="gradient" variant="gradient"
gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }} gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }}
leftSection={<TbApps size={18} />} leftSection={<TbApps size={18} />}
radius="md" radius="md"
component={Link} component={Link}
to="/apps" to="/apps"
size="sm"
> >
Manage All Apps Manage Apps
</Button> */} </Button>
</Group> </Group>
{statsLoading ? ( {statsLoading ? (
@@ -89,33 +131,43 @@ function DashboardPage() {
) : ( ) : (
<SimpleGrid cols={{ base: 1, sm: 3 }}> <SimpleGrid cols={{ base: 1, sm: 3 }}>
<StatsCard <StatsCard
title="Total Applications" title="Applications"
value={stats?.totalApps || 0} value={stats?.totalApps ?? 0}
description="Registered platforms"
icon={TbApps} icon={TbApps}
color="brand-blue" color="brand-blue"
// trend={{ value: stats?.trends?.totalApps.toString() || '0', positive: true }}
/> />
<StatsCard <StatsCard
title="New Errors" title="Open Errors"
value={stats?.newErrors || 0} value={stats?.newErrors ?? 0}
description="Unresolved bug reports"
icon={TbMessageReport} icon={TbMessageReport}
color="brand-purple" color="red"
// trend={{ value: stats?.trends?.newErrors.toString() || '0', positive: false }}
/> />
<StatsCard <StatsCard
title="Users" title="Operators"
value={stats?.activeUsers || 0} value={stats?.activeUsers ?? 0}
description="Active platform users"
icon={TbUsers} icon={TbUsers}
color="teal" color="teal"
// trend={{ value: stats?.trends?.activeUsers.toString() || '0', positive: true }}
/> />
</SimpleGrid> </SimpleGrid>
)} )}
<Group justify="space-between" mt="md"> <Group justify="space-between" align="flex-end" mt="md">
<Title order={3}>Registered Applications</Title> <Stack gap={2}>
<Button variant="subtle" color="brand-blue" rightSection={<TbChevronRight size={16} />} component={Link} to="/apps"> <Title order={3}>Registered Applications</Title>
View All Apps <Text size="sm" c="dimmed">All monitored apps on this platform.</Text>
</Stack>
<Button
variant="subtle"
color="brand-blue"
rightSection={<TbChevronRight size={16} />}
component={Link}
to="/apps"
size="sm"
>
View All
</Button> </Button>
</Group> </Group>
@@ -129,22 +181,32 @@ function DashboardPage() {
</SimpleGrid> </SimpleGrid>
)} )}
<Group justify="space-between" mt="md"> <Group justify="space-between" align="flex-end" mt="md">
<Title order={3}>Recent Error Reports</Title> <Stack gap={2}>
<Button variant="subtle" color="brand-blue" rightSection={<TbChevronRight size={16} />} component={Link} to="/bug-reports"> <Title order={3}>Recent Error Reports</Title>
View All Errors <Text size="sm" c="dimmed">Latest bug submissions across all apps.</Text>
</Stack>
<Button
variant="subtle"
color="brand-blue"
rightSection={<TbChevronRight size={16} />}
component={Link}
to="/bug-reports"
size="sm"
>
View All
</Button> </Button>
</Group> </Group>
<Paper withBorder radius="2xl" className="glass" p="md"> <Paper withBorder radius="2xl" className="glass" p="md" style={{ overflowX: 'auto' }}>
<Table className="data-table" verticalSpacing="md"> <Table className="data-table" verticalSpacing="sm" style={{ minWidth: 560 }}>
<Table.Thead> <Table.Thead>
<Table.Tr> <Table.Tr>
<Table.Th>Application</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>App</Table.Th>
<Table.Th>Error Message</Table.Th> <Table.Th>Error Message</Table.Th>
<Table.Th>Version</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Version</Table.Th>
<Table.Th>Time</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Reported</Table.Th>
<Table.Th>Severity</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Status</Table.Th>
</Table.Tr> </Table.Tr>
</Table.Thead> </Table.Thead>
<Table.Tbody> <Table.Tbody>
@@ -156,30 +218,39 @@ function DashboardPage() {
</Table.Tr> </Table.Tr>
) : recentErrors.length === 0 ? ( ) : recentErrors.length === 0 ? (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={5} align="center" py="xl"> <Table.Td colSpan={5}>
<Text c="dimmed" size="sm">No recent errors found.</Text> <Stack align="center" gap="xs" py="xl">
<TbAlertCircle size={32} style={{ opacity: 0.25 }} />
<Text c="dimmed" size="sm">No error reports yet — all systems are running smoothly.</Text>
</Stack>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
) : recentErrors.map((error: any) => ( ) : recentErrors.map((error: any) => (
<Table.Tr key={error.id}> <Table.Tr key={error.id}>
<Table.Td> <Table.Td style={{ whiteSpace: 'nowrap' }}>
<Text fw={600} size="sm" style={{ textTransform: 'uppercase' }}>{error.app}</Text> <Text fw={600} size="sm" tt="uppercase">{error.app}</Text>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td style={{ maxWidth: 280 }}>
<Text size="sm" c="dimmed" lineClamp={1}>{error.message}</Text> <Tooltip label={error.message} multiline maw={320} withArrow position="top-start">
<Text size="sm" c="dimmed" lineClamp={1} style={{ cursor: 'default' }}>
{error.message}
</Text>
</Tooltip>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td style={{ whiteSpace: 'nowrap' }}>
<Badge variant="light" color="gray">v{error.version}</Badge> <Badge variant="light" color="gray" size="sm">v{error.version}</Badge>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td style={{ whiteSpace: 'nowrap' }}>
<Text size="xs" c="dimmed">{formatTimeAgo(error.time)}</Text> <Text size="xs" c="dimmed">{formatTimeAgo(error.time)}</Text>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td style={{ whiteSpace: 'nowrap' }}>
<Badge <Badge
color={error.severity === 'OPEN' ? 'red' : error.severity === 'IN_PROGRESS' || error.severity === 'ON_HOLD' ? 'orange' : 'yellow'} color={SEVERITY_COLOR[error.severity] ?? 'gray'}
variant="dot" variant="light"
size="sm"
tt="capitalize"
> >
{error.severity.toUpperCase()} {formatSeverityLabel(error.severity)}
</Badge> </Badge>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>

View File

@@ -8,7 +8,9 @@ import {
Button, Button,
Card, Card,
Center, Center,
CopyButton,
Container, Container,
Divider,
Group, Group,
Loader, Loader,
Menu, Menu,
@@ -53,11 +55,14 @@ import {
TbApps, TbApps,
TbBug, TbBug,
TbChevronRight, TbChevronRight,
TbCheck,
TbCopy, TbCopy,
TbCircleFilled, TbCircleFilled,
TbCode, TbCode,
TbDatabase, TbDatabase,
TbDots, TbDots,
TbEye,
TbEyeOff,
TbFileText, TbFileText,
TbKey, TbKey,
TbLayoutDashboard, TbLayoutDashboard,
@@ -77,7 +82,7 @@ import { notifications } from '@mantine/notifications'
import { type Role, useLogout, useSession } from '@/frontend/hooks/useAuth' import { type Role, useLogout, useSession } from '@/frontend/hooks/useAuth'
import { usePresence } from '@/frontend/hooks/usePresence' import { usePresence } from '@/frontend/hooks/usePresence'
const validTabs = ['overview', 'operators', 'bugs', 'app-logs', 'activity-logs', 'database', 'project', 'settings'] as const const validTabs = ['overview', 'operators', 'bugs', 'app-logs', 'activity-logs', 'database', 'project', 'settings', 'api-keys'] as const
export const Route = createFileRoute('/dev')({ export const Route = createFileRoute('/dev')({
validateSearch: (search: Record<string, unknown>) => ({ validateSearch: (search: Record<string, unknown>) => ({
@@ -117,7 +122,9 @@ const navItems = [
// { label: 'Activity Logs', icon: TbActivity, key: 'activity-logs' }, // { label: 'Activity Logs', icon: TbActivity, key: 'activity-logs' },
{ label: 'Database', icon: TbDatabase, key: 'database' }, { label: 'Database', icon: TbDatabase, key: 'database' },
{ label: 'Project', icon: TbSitemap, key: 'project' }, { label: 'Project', icon: TbSitemap, key: 'project' },
{ label: 'Settings', icon: TbSettings, key: 'settings' }, { label: 'App Config', icon: TbSettings, key: 'settings' },
{ divider: true, key: '__divider-external__' },
{ label: 'Desa Mandiri Keys', icon: TbKey, key: 'api-keys' },
] ]
function DevPage() { function DevPage() {
@@ -200,7 +207,8 @@ function DevPage() {
<AppShell.Section grow> <AppShell.Section grow>
<Stack gap={4}> <Stack gap={4}>
{navItems.map((item) => { {navItems.map((item) => {
const Icon = item.icon if (item.divider) return <Divider key={item.key} my={4} />
const Icon = item.icon!
if (collapsed) { if (collapsed) {
return ( return (
<Tooltip key={item.key} label={item.label} position="right"> <Tooltip key={item.key} label={item.label} position="right">
@@ -274,6 +282,7 @@ function DevPage() {
{active === 'activity-logs' && <ActivityLogsPanel />} {active === 'activity-logs' && <ActivityLogsPanel />}
{active === 'database' && <DatabasePanel />} {active === 'database' && <DatabasePanel />}
{active === 'project' && <ProjectPanel />} {active === 'project' && <ProjectPanel />}
{active === 'api-keys' && <ApiKeysPanel />}
{active === 'settings' && <SettingsPanel />} {active === 'settings' && <SettingsPanel />}
</Container> </Container>
</AppShell.Main> </AppShell.Main>
@@ -1469,6 +1478,8 @@ interface AppEntry {
id: string id: string
name: string name: string
urlApi: string | null urlApi: string | null
apiKey: string
clientApiKey: string
status: string status: string
active: boolean active: boolean
hasClientApiKey: boolean hasClientApiKey: boolean
@@ -1496,10 +1507,24 @@ function SettingsPanel() {
const [keyOpened, { open: openKey, close: closeKey }] = useDisclosure(false) const [keyOpened, { open: openKey, close: closeKey }] = useDisclosure(false)
const [generatedKey, setGeneratedKey] = useState('') const [generatedKey, setGeneratedKey] = useState('')
const [keyCopied, setKeyCopied] = useState(false) const [keyCopied, setKeyCopied] = useState(false)
const [generatedKeyVisible, setGeneratedKeyVisible] = useState(false)
const [addKeyVisible, setAddKeyVisible] = useState(false)
const [apiConfigKeyVisible, setApiConfigKeyVisible] = useState(false)
const [visibleAppKeys, setVisibleAppKeys] = useState<Set<string>>(new Set())
const toggleAppKeyVisibility = (appId: string) => {
setVisibleAppKeys((prev) => {
const next = new Set(prev)
if (next.has(appId)) next.delete(appId)
else next.add(appId)
return next
})
}
const openApiModal = (app: AppEntry) => { const openApiModal = (app: AppEntry) => {
setApiTarget(app) setApiTarget(app)
setApiForm({ urlApi: app.urlApi ?? '', apiKey: '' }) setApiForm({ urlApi: app.urlApi ?? '', apiKey: '' })
setApiConfigKeyVisible(false)
openApi() openApi()
} }
@@ -1557,6 +1582,7 @@ function SettingsPanel() {
qc.invalidateQueries({ queryKey: ['apps'] }) qc.invalidateQueries({ queryKey: ['apps'] })
setGeneratedKey(res.clientApiKey) setGeneratedKey(res.clientApiKey)
setKeyCopied(false) setKeyCopied(false)
setGeneratedKeyVisible(false)
openKey() openKey()
}, },
}) })
@@ -1588,7 +1614,7 @@ function SettingsPanel() {
<Stack> <Stack>
<Group justify="space-between"> <Group justify="space-between">
<div> <div>
<Title order={3}>Application Settings</Title> <Title order={3}>App Config</Title>
<Text size="sm" c="dimmed">Manage the URL API and API Key for each application.</Text> <Text size="sm" c="dimmed">Manage the URL API and API Key for each application.</Text>
</div> </div>
<Button leftSection={<TbApps size={16} />} onClick={openAdd}>Add App</Button> <Button leftSection={<TbApps size={16} />} onClick={openAdd}>Add App</Button>
@@ -1621,6 +1647,54 @@ function SettingsPanel() {
: <Badge color="red" variant="dot" size="xs">No client key</Badge> : <Badge color="red" variant="dot" size="xs">No client key</Badge>
} }
</Group> </Group>
{app.clientApiKey && (
<>
<Text size="xs" fw={500} c="gray" mt={4}>Client Key (untuk mobile app mengakses monitoring):</Text>
<Group gap={4} wrap="nowrap">
<Text size="xs" ff="monospace" c="dimmed" style={{ userSelect: visibleAppKeys.has(app.id) ? 'text' : 'none' }}>
{visibleAppKeys.has(app.id) ? app.clientApiKey : '•'.repeat(32)}
</Text>
<Tooltip label={visibleAppKeys.has(app.id) ? 'Sembunyikan' : 'Tampilkan'}>
<ActionIcon variant="subtle" size="xs" color="gray" onClick={() => toggleAppKeyVisibility(app.id)}>
{visibleAppKeys.has(app.id) ? <TbEyeOff size={12} /> : <TbEye size={12} />}
</ActionIcon>
</Tooltip>
<CopyButton value={app.clientApiKey}>
{({ copy }) => (
<Tooltip label="Salin">
<ActionIcon variant="subtle" size="xs" color="gray" onClick={copy}>
<TbCopy size={12} />
</ActionIcon>
</Tooltip>
)}
</CopyButton>
</Group>
</>
)}
{app.apiKey && (
<>
<Text size="xs" fw={500} c="gray" mt={4}>Server Key (untuk monitoring mengakses API external):</Text>
<Group gap={4} wrap="nowrap">
<Text size="xs" ff="monospace" c="dimmed" style={{ userSelect: visibleAppKeys.has(`server-${app.id}`) ? 'text' : 'none' }}>
{visibleAppKeys.has(`server-${app.id}`) ? app.apiKey : '•'.repeat(32)}
</Text>
<Tooltip label={visibleAppKeys.has(`server-${app.id}`) ? 'Sembunyikan' : 'Tampilkan'}>
<ActionIcon variant="subtle" size="xs" color="gray" onClick={() => toggleAppKeyVisibility(`server-${app.id}`)}>
{visibleAppKeys.has(`server-${app.id}`) ? <TbEyeOff size={12} /> : <TbEye size={12} />}
</ActionIcon>
</Tooltip>
<CopyButton value={app.apiKey}>
{({ copy }) => (
<Tooltip label="Salin">
<ActionIcon variant="subtle" size="xs" color="gray" onClick={copy}>
<TbCopy size={12} />
</ActionIcon>
</Tooltip>
)}
</CopyButton>
</Group>
</>
)}
</Box> </Box>
</Group> </Group>
<Group gap="xs" wrap="nowrap"> <Group gap="xs" wrap="nowrap">
@@ -1654,7 +1728,19 @@ function SettingsPanel() {
<TextInput label="App ID" description="Unique slug used as identifier (e.g. desa-plus)" placeholder="my-app" value={newApp.id} onChange={(e) => setNewApp((p) => ({ ...p, id: e.target.value }))} required /> <TextInput label="App ID" description="Unique slug used as identifier (e.g. desa-plus)" placeholder="my-app" value={newApp.id} onChange={(e) => setNewApp((p) => ({ ...p, id: e.target.value }))} required />
<TextInput label="Name" placeholder="My Application" value={newApp.name} onChange={(e) => setNewApp((p) => ({ ...p, name: e.target.value }))} required /> <TextInput label="Name" placeholder="My Application" value={newApp.name} onChange={(e) => setNewApp((p) => ({ ...p, name: e.target.value }))} required />
<TextInput label="URL API" placeholder="https://api.example.com" value={newApp.urlApi} onChange={(e) => setNewApp((p) => ({ ...p, urlApi: e.target.value }))} /> <TextInput label="URL API" placeholder="https://api.example.com" value={newApp.urlApi} onChange={(e) => setNewApp((p) => ({ ...p, urlApi: e.target.value }))} />
<TextInput label="API Key" placeholder="secret-key" type="password" value={newApp.apiKey} onChange={(e) => setNewApp((p) => ({ ...p, apiKey: e.target.value }))} /> <TextInput
label="Server Key (API External)"
description="Key untuk monitoring mengakses API external app ini."
placeholder="secret-key"
type={addKeyVisible ? 'text' : 'password'}
value={newApp.apiKey}
onChange={(e) => setNewApp((p) => ({ ...p, apiKey: e.target.value }))}
rightSection={
<ActionIcon variant="subtle" size="sm" color="gray" onClick={() => setAddKeyVisible((v) => !v)}>
{addKeyVisible ? <TbEyeOff size={14} /> : <TbEye size={14} />}
</ActionIcon>
}
/>
<Group justify="flex-end" mt="xs"> <Group justify="flex-end" mt="xs">
<Button variant="subtle" color="gray" onClick={closeAdd}>Cancel</Button> <Button variant="subtle" color="gray" onClick={closeAdd}>Cancel</Button>
<Button loading={createMutation.isPending} disabled={!newApp.id || !newApp.name} onClick={() => createMutation.mutate(newApp)}>Add</Button> <Button loading={createMutation.isPending} disabled={!newApp.id || !newApp.name} onClick={() => createMutation.mutate(newApp)}>Add</Button>
@@ -1666,21 +1752,28 @@ function SettingsPanel() {
<Modal opened={keyOpened} onClose={closeKey} title="Client API Key Generated" radius="md"> <Modal opened={keyOpened} onClose={closeKey} title="Client API Key Generated" radius="md">
<Stack gap="sm"> <Stack gap="sm">
<Text size="sm" c="dimmed">Copy this key now it will not be shown again after you close this dialog.</Text> <Text size="sm" c="dimmed">Copy this key now it will not be shown again after you close this dialog.</Text>
<Box <Group gap={4} wrap="nowrap" align="center">
p="sm" <Box
style={{ background: 'var(--mantine-color-dark-6)', borderRadius: 6, fontFamily: 'monospace', fontSize: 13, wordBreak: 'break-all' }} p="sm"
> flex={1}
{generatedKey} style={{ background: 'var(--mantine-color-dark-6)', borderRadius: 6, fontFamily: 'monospace', fontSize: 13, wordBreak: 'break-all', userSelect: generatedKeyVisible ? 'text' : 'none' }}
</Box>
<Group justify="flex-end">
<Button
variant="light"
color={keyCopied ? 'green' : 'blue'}
leftSection={<TbCopy size={14} />}
onClick={() => { navigator.clipboard.writeText(generatedKey); setKeyCopied(true) }}
> >
{keyCopied ? 'Copied!' : 'Copy to Clipboard'} {generatedKeyVisible ? generatedKey : '•'.repeat(48)}
</Button> </Box>
<Tooltip label={generatedKeyVisible ? 'Sembunyikan' : 'Tampilkan'}>
<ActionIcon variant="subtle" color="gray" onClick={() => setGeneratedKeyVisible((v) => !v)}>
{generatedKeyVisible ? <TbEyeOff size={16} /> : <TbEye size={16} />}
</ActionIcon>
</Tooltip>
</Group>
<Group justify="flex-end">
<CopyButton value={generatedKey}>
{({ copy }) => (
<Button variant="light" color={keyCopied ? 'green' : 'blue'} leftSection={<TbCopy size={14} />} onClick={() => { copy(); setKeyCopied(true) }}>
{keyCopied ? 'Copied!' : 'Copy to Clipboard'}
</Button>
)}
</CopyButton>
<Button variant="subtle" color="gray" onClick={closeKey}>Close</Button> <Button variant="subtle" color="gray" onClick={closeKey}>Close</Button>
</Group> </Group>
</Stack> </Stack>
@@ -1690,14 +1783,26 @@ function SettingsPanel() {
<Modal opened={apiOpened} onClose={closeApi} title={`API Config — ${apiTarget?.name}`} radius="md"> <Modal opened={apiOpened} onClose={closeApi} title={`API Config — ${apiTarget?.name}`} radius="md">
<Stack gap="sm"> <Stack gap="sm">
<TextInput label="URL API" description="Base URL for proxying requests to the external API." placeholder="https://api.example.com" value={apiForm.urlApi} onChange={(e) => setApiForm((p) => ({ ...p, urlApi: e.target.value }))} /> <TextInput label="URL API" description="Base URL for proxying requests to the external API." placeholder="https://api.example.com" value={apiForm.urlApi} onChange={(e) => setApiForm((p) => ({ ...p, urlApi: e.target.value }))} />
<TextInput label="API Key" description="Leave blank to keep the existing key unchanged." placeholder="Leave blank to keep unchanged" type="password" value={apiForm.apiKey} onChange={(e) => setApiForm((p) => ({ ...p, apiKey: e.target.value }))} /> <TextInput
label="Server Key (API External)"
description="Key untuk monitoring mengakses API external. Kosongkan untuk tetap menggunakan key yang ada."
placeholder="Kosongkan untuk tetap menggunakan key yang ada"
type={apiConfigKeyVisible ? 'text' : 'password'}
value={apiForm.apiKey}
onChange={(e) => setApiForm((p) => ({ ...p, apiKey: e.target.value }))}
rightSection={
<ActionIcon variant="subtle" size="sm" color="gray" onClick={() => setApiConfigKeyVisible((v) => !v)}>
{apiConfigKeyVisible ? <TbEyeOff size={14} /> : <TbEye size={14} />}
</ActionIcon>
}
/>
<Group justify="flex-end" mt="xs"> <Group justify="flex-end" mt="xs">
<Button variant="subtle" color="gray" onClick={closeApi}>Cancel</Button> <Button variant="subtle" color="gray" onClick={closeApi}>Cancel</Button>
<Button <Button
loading={apiMutation.isPending} loading={apiMutation.isPending}
onClick={() => { onClick={() => {
if (!apiTarget) return if (!apiTarget) return
const body: any = { urlApi: apiForm.urlApi } const body: { urlApi: string; apiKey?: string } = { urlApi: apiForm.urlApi }
if (apiForm.apiKey) body.apiKey = apiForm.apiKey if (apiForm.apiKey) body.apiKey = apiForm.apiKey
apiMutation.mutate({ id: apiTarget.id, body }) apiMutation.mutate({ id: apiTarget.id, body })
}} }}
@@ -1711,6 +1816,254 @@ function SettingsPanel() {
) )
} }
// ─── API Keys Panel ────────────────────────────────────────────────────────────
interface ApiKeyItem {
id: string
name: string
key: string
isActive: boolean
createdAt: string
updatedAt: string
}
function ApiKeysPanel() {
const qc = useQueryClient()
const [createOpened, { open: openCreate, close: closeCreate }] = useDisclosure(false)
const [newKeyName, setNewKeyName] = useState('')
const [createdKey, setCreatedKey] = useState<string | null>(null)
const [keyCopied, setKeyCopied] = useState(false)
const [revealedOpened, { open: openRevealed, close: closeRevealed }] = useDisclosure(false)
const [copyingId, setCopyingId] = useState<string | null>(null)
const [copiedId, setCopiedId] = useState<string | null>(null)
const copyFullKey = async (id: string) => {
setCopyingId(id)
try {
const res = await fetch(`/api/admin/api-keys/${id}`, { credentials: 'include' })
const json = await res.json()
const fullKey = json.data?.key
if (fullKey) {
await navigator.clipboard.writeText(fullKey)
setCopiedId(id)
setTimeout(() => setCopiedId(null), 2000)
}
} finally {
setCopyingId(null)
}
}
const { data, isLoading } = useQuery({
queryKey: ['admin', 'api-keys'],
queryFn: () => fetch('/api/admin/api-keys', { credentials: 'include' }).then((r) => r.json()),
})
const keys: ApiKeyItem[] = data?.keys ?? []
const createMutation = useMutation({
mutationFn: async (name: string) => {
const r = await fetch('/api/admin/api-keys', {
method: 'POST',
credentials: 'include',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ name }),
})
const json = await r.json()
if (!r.ok) throw new Error(json.error ?? 'Gagal membuat API key')
return json
},
onSuccess: (res) => {
qc.invalidateQueries({ queryKey: ['admin', 'api-keys'] })
closeCreate()
setNewKeyName('')
if (res.key?.key) {
setCreatedKey(res.key.key)
setKeyCopied(false)
openRevealed()
}
},
onError: (err: Error) => notifications.show({ color: 'red', title: 'Gagal', message: err.message }),
})
const toggleMutation = useMutation({
mutationFn: ({ id, isActive }: { id: string; isActive: boolean }) =>
fetch(`/api/admin/api-keys/${id}`, {
method: 'PATCH',
credentials: 'include',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ isActive }),
}).then((r) => r.json()),
onSuccess: () => qc.invalidateQueries({ queryKey: ['admin', 'api-keys'] }),
})
const deleteMutation = useMutation({
mutationFn: (id: string) =>
fetch(`/api/admin/api-keys/${id}`, { method: 'DELETE', credentials: 'include' }).then((r) => r.json()),
onSuccess: () => qc.invalidateQueries({ queryKey: ['admin', 'api-keys'] }),
})
const confirmDelete = (key: ApiKeyItem) => {
modals.openConfirmModal({
title: 'Hapus API Key',
children: (
<Text size="sm">
Yakin hapus key <strong>{key.name}</strong>? Semua klien yang menggunakan key ini akan kehilangan akses.
</Text>
),
labels: { confirm: 'Hapus', cancel: 'Batal' },
confirmProps: { color: 'red' },
onConfirm: () => deleteMutation.mutate(key.id),
})
}
return (
<Stack>
<Group justify="space-between">
<div>
<Title order={3}>Desa Mandiri Keys</Title>
<Text size="sm" c="dimmed">Manage access tokens for the Desa Mandiri system</Text>
</div>
<Button leftSection={<TbKey size={14} />} onClick={openCreate}>
Buat Key Baru
</Button>
</Group>
{isLoading ? (
<Center><Loader /></Center>
) : keys.length === 0 ? (
<Paper withBorder p="xl" radius="md">
<Center>
<Stack align="center" gap="xs">
<ThemeIcon size="xl" variant="light" color="gray"><TbKey size={24} /></ThemeIcon>
<Text c="dimmed" size="sm">Belum ada API key. Buat key pertama untuk mengakses API.</Text>
</Stack>
</Center>
</Paper>
) : (
<Table.ScrollContainer minWidth={600}>
<Table striped highlightOnHover>
<Table.Thead>
<Table.Tr>
<Table.Th>Nama</Table.Th>
<Table.Th>Key</Table.Th>
<Table.Th>Status</Table.Th>
<Table.Th>Dibuat</Table.Th>
<Table.Th w={100}>Aksi</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{keys.map((k) => (
<Table.Tr key={k.id}>
<Table.Td fw={500}>{k.name}</Table.Td>
<Table.Td>
<Group gap={4} wrap="nowrap">
<Text size="xs" ff="monospace" c="dimmed">
{k.key}
</Text>
<Tooltip label={copiedId === k.id ? 'Tersalin!' : 'Salin full key'}>
<ActionIcon
variant="subtle"
size="xs"
color={copiedId === k.id ? 'green' : 'gray'}
loading={copyingId === k.id}
onClick={() => copyFullKey(k.id)}
>
{copiedId === k.id ? <TbCheck size={12} /> : <TbCopy size={12} />}
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
<Table.Td>
<Badge color={k.isActive ? 'green' : 'gray'} variant="light">
{k.isActive ? 'Aktif' : 'Nonaktif'}
</Badge>
</Table.Td>
<Table.Td>
<Text size="xs" c="dimmed">{new Date(k.createdAt).toLocaleDateString('id-ID')}</Text>
</Table.Td>
<Table.Td>
<Group gap={4}>
<Tooltip label={k.isActive ? 'Nonaktifkan' : 'Aktifkan'}>
<ActionIcon
variant="subtle"
color={k.isActive ? 'orange' : 'green'}
size="sm"
loading={toggleMutation.isPending}
onClick={() => toggleMutation.mutate({ id: k.id, isActive: !k.isActive })}
>
<TbRefresh size={14} />
</ActionIcon>
</Tooltip>
<Tooltip label="Hapus">
<ActionIcon
variant="subtle"
color="red"
size="sm"
loading={deleteMutation.isPending}
onClick={() => confirmDelete(k)}
>
<TbTrash size={14} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
</Table.Tr>
))}
</Table.Tbody>
</Table>
</Table.ScrollContainer>
)}
{/* ── Create Key Modal ── */}
<Modal opened={createOpened} onClose={closeCreate} title="Buat API Key Baru" radius="md">
<Stack gap="sm">
<TextInput
label="Nama Key"
description="Label untuk mengidentifikasi key ini (misal: Jenna Mobile App)"
placeholder="Nama key..."
value={newKeyName}
onChange={(e) => setNewKeyName(e.target.value)}
required
/>
<Group justify="flex-end" mt="xs">
<Button variant="subtle" color="gray" onClick={closeCreate}>Batal</Button>
<Button
loading={createMutation.isPending}
disabled={!newKeyName.trim()}
onClick={() => createMutation.mutate(newKeyName)}
>
Buat Key
</Button>
</Group>
</Stack>
</Modal>
{/* ── Reveal Key Modal ── */}
<Modal opened={revealedOpened} onClose={closeRevealed} title="API Key Berhasil Dibuat" radius="md">
<Stack gap="sm">
<Text size="sm" c="dimmed">Salin key ini sekarang key tidak akan ditampilkan kembali setelah dialog ini ditutup.</Text>
<Box
p="sm"
style={{ background: 'var(--mantine-color-dark-6)', borderRadius: 6, fontFamily: 'monospace', fontSize: 13, wordBreak: 'break-all' }}
>
{createdKey}
</Box>
<Group justify="flex-end">
<Button
variant="light"
color={keyCopied ? 'green' : 'blue'}
leftSection={<TbCopy size={14} />}
onClick={() => { if (createdKey) { navigator.clipboard.writeText(createdKey); setKeyCopied(true) } }}
>
{keyCopied ? 'Tersalin!' : 'Salin Key'}
</Button>
<Button variant="subtle" color="gray" onClick={() => { closeRevealed(); setCreatedKey(null) }}>Tutup</Button>
</Group>
</Stack>
</Modal>
</Stack>
)
}
void TbFileText void TbFileText
void TbCode void TbCode
void TbUser void TbUser

View File

@@ -1,7 +1,7 @@
import { Button, Container, Group, Stack, Text, Title } from '@mantine/core' import { Button, Box, Center, Stack, Text, Title } from '@mantine/core'
import { Link, createFileRoute } from '@tanstack/react-router' import { Link, createFileRoute } from '@tanstack/react-router'
import { SiBun } from 'react-icons/si' import { TbLogin } from 'react-icons/tb'
import { TbBrandReact, TbLogin, TbRocket } from 'react-icons/tb' import logoUrl from '../../logo.svg'
export const Route = createFileRoute('/')({ export const Route = createFileRoute('/')({
component: HomePage, component: HomePage,
@@ -9,28 +9,67 @@ export const Route = createFileRoute('/')({
function HomePage() { function HomePage() {
return ( return (
<Container size="sm" py="xl"> <Box style={{ minHeight: '100vh', background: '#1a1a2e', position: 'relative', overflow: 'hidden' }}>
<Stack align="center" gap="lg"> {/* background blobs */}
<Group gap="lg"> <Box style={{
<SiBun size={64} color="#fbf0df" /> position: 'absolute', top: '-15%', left: '-10%',
<TbBrandReact size={64} color="#61dafb" /> width: 500, height: 500, borderRadius: '50%',
</Group> background: 'radial-gradient(circle, rgba(124,58,237,0.25) 0%, transparent 70%)',
pointerEvents: 'none',
}} />
<Box style={{
position: 'absolute', bottom: '-20%', right: '-10%',
width: 600, height: 600, borderRadius: '50%',
background: 'radial-gradient(circle, rgba(79,70,229,0.2) 0%, transparent 70%)',
pointerEvents: 'none',
}} />
<Box style={{
position: 'absolute', top: '50%', left: '60%',
width: 300, height: 300, borderRadius: '50%',
background: 'radial-gradient(circle, rgba(168,85,247,0.1) 0%, transparent 70%)',
pointerEvents: 'none',
}} />
<Title order={1}>Bun + Elysia + Vite + React</Title> <Center mih="100vh" style={{ position: 'relative', zIndex: 1 }}>
<Stack align="center" gap="xl">
<img
src={logoUrl}
width={72}
height={72}
alt="logo"
style={{ borderRadius: 20, boxShadow: '0 4px 32px rgba(124,58,237,0.5)', display: 'block' }}
/>
<Text c="dimmed" ta="center" maw={480}> <Stack align="center" gap={8}>
Full-stack starter template with Mantine UI, TanStack Router, and session-based auth. <Title
</Text> order={1}
c="white"
fw={800}
ta="center"
style={{ fontSize: '2.6rem', letterSpacing: '-0.5px', lineHeight: 1.15 }}
>
Monitoring System
</Title>
<Text c="dimmed" ta="center" size="md" maw={320} lh={1.6}>
Pantau semua aplikasi dalam satu tempat, real-time.
</Text>
</Stack>
<Group> <Button
<Button component={Link} to="/login" leftSection={<TbLogin size={18} />} variant="filled"> component={Link}
Login to="/login"
leftSection={<TbLogin size={18} />}
size="md"
style={{
background: 'linear-gradient(135deg, #4f46e5, #7c3aed)',
border: 'none',
paddingInline: 32,
}}
>
Masuk
</Button> </Button>
<Button component={Link} to="/dashboard" leftSection={<TbRocket size={18} />} variant="light"> </Stack>
Dashboard </Center>
</Button> </Box>
</Group>
</Stack>
</Container>
) )
} }

View File

@@ -1,10 +1,11 @@
import { useLogin } from '@/frontend/hooks/useAuth' import { useLogin } from '@/frontend/hooks/useAuth'
import logoUrl from '../../logo.svg'
import { import {
Alert, Alert,
Box,
Button, Button,
Center, Center,
Divider, Divider,
Paper,
PasswordInput, PasswordInput,
Stack, Stack,
Text, Text,
@@ -38,6 +39,14 @@ export const Route = createFileRoute('/login')({
component: LoginPage, component: LoginPage,
}) })
const OAUTH_ERRORS: Record<string, string> = {
google_denied: 'Login dengan Google dibatalkan.',
invalid_state: 'Sesi OAuth tidak valid, silakan coba lagi.',
token_failed: 'Gagal menukar token Google, silakan coba lagi.',
userinfo_failed: 'Gagal mengambil info akun Google, silakan coba lagi.',
account_disabled: 'Akun Anda telah dinonaktifkan. Hubungi admin untuk informasi lebih lanjut.',
}
function LoginPage() { function LoginPage() {
const login = useLogin() const login = useLogin()
const { error: searchError } = Route.useSearch() const { error: searchError } = Route.useSearch()
@@ -49,69 +58,117 @@ function LoginPage() {
login.mutate({ email, password }) login.mutate({ email, password })
} }
const errorMessage = login.isError
? login.error.message
: searchError
? (OAUTH_ERRORS[searchError] ?? 'Login dengan Google gagal, silakan coba lagi.')
: null
return ( return (
<Center mih="100vh"> <Box style={{ minHeight: '100vh', background: '#1a1a2e', position: 'relative', overflow: 'hidden' }}>
<Paper shadow="md" p="xl" radius="md" w={400} withBorder> {/* background blobs */}
<form onSubmit={handleSubmit}> <Box style={{
<Stack gap="md"> position: 'absolute', top: '-15%', left: '-10%',
<Title order={2} ta="center"> width: 500, height: 500, borderRadius: '50%',
Login background: 'radial-gradient(circle, rgba(124,58,237,0.25) 0%, transparent 70%)',
</Title> pointerEvents: 'none',
}} />
<Box style={{
position: 'absolute', bottom: '-20%', right: '-10%',
width: 600, height: 600, borderRadius: '50%',
background: 'radial-gradient(circle, rgba(79,70,229,0.2) 0%, transparent 70%)',
pointerEvents: 'none',
}} />
<Box style={{
position: 'absolute', top: '50%', left: '60%',
width: 300, height: 300, borderRadius: '50%',
background: 'radial-gradient(circle, rgba(168,85,247,0.1) 0%, transparent 70%)',
pointerEvents: 'none',
}} />
{(login.isError || searchError) && ( <Center mih="100vh" style={{ position: 'relative', zIndex: 1 }}>
<Alert icon={<TbAlertCircle size={16} />} color="red" variant="light"> <Box
{login.isError ? login.error.message : ( p="xl"
{ w={400}
google_denied: 'Login dengan Google dibatalkan.', style={{
invalid_state: 'Sesi OAuth tidak valid, silakan coba lagi.', background: 'rgba(36,36,36,0.75)',
token_failed: 'Gagal menukar token Google, silakan coba lagi.', backdropFilter: 'blur(20px)',
userinfo_failed: 'Gagal mengambil info akun Google, silakan coba lagi.', borderRadius: 20,
account_disabled: 'Akun Anda telah dinonaktifkan. Hubungi admin untuk informasi lebih lanjut.', border: '1px solid rgba(124,58,237,0.35)',
}[searchError ?? ''] ?? 'Login dengan Google gagal, silakan coba lagi.' boxShadow: '0 0 0 1px rgba(124,58,237,0.1), 0 8px 32px rgba(0,0,0,0.4), 0 0 60px rgba(124,58,237,0.12)',
)} }}
</Alert> >
)} <form onSubmit={handleSubmit}>
<Stack gap="md">
{/* header */}
<Stack gap={8} align="center" mb={4}>
<img
src={logoUrl}
width={56}
height={56}
alt="logo"
style={{ borderRadius: 14, boxShadow: '0 4px 20px rgba(124,58,237,0.45)', display: 'block' }}
/>
<Title order={2} fw={700} ta="center" c="white">
Monitoring System
</Title>
<Text c="dimmed" size="sm" ta="center">
Masuk untuk melanjutkan
</Text>
</Stack>
<TextInput {errorMessage && (
label="Email" <Alert icon={<TbAlertCircle size={16} />} color="red" variant="light">
placeholder="email@example.com" {errorMessage}
leftSection={<TbMail size={16} />} </Alert>
value={email} )}
onChange={(e) => setEmail(e.currentTarget.value)}
required
/>
<PasswordInput <TextInput
label="Password" label="Email"
placeholder="Password" placeholder="email@example.com"
leftSection={<TbLock size={16} />} leftSection={<TbMail size={16} />}
value={password} value={email}
onChange={(e) => setPassword(e.currentTarget.value)} onChange={(e) => setEmail(e.currentTarget.value)}
required required
/> />
<Button <PasswordInput
type="submit" label="Password"
fullWidth placeholder="Password"
leftSection={<TbLogin size={18} />} leftSection={<TbLock size={16} />}
loading={login.isPending} value={password}
> onChange={(e) => setPassword(e.currentTarget.value)}
Sign in required
</Button> />
<Divider label="or" labelPosition="center" /> <Button
type="submit"
fullWidth
leftSection={<TbLogin size={18} />}
loading={login.isPending}
mt={4}
style={{
background: 'linear-gradient(135deg, #4f46e5, #7c3aed)',
border: 'none',
}}
>
Sign in
</Button>
<Button <Divider label="atau" labelPosition="center" />
variant="default"
fullWidth <Button
leftSection={<FcGoogle size={18} />} variant="default"
onClick={() => { window.location.href = '/api/auth/google' }} fullWidth
> leftSection={<FcGoogle size={18} />}
Continue with Google onClick={() => { window.location.href = '/api/auth/google' }}
</Button> >
</Stack> Continue with Google
</form> </Button>
</Paper> </Stack>
</Center> </form>
</Box>
</Center>
</Box>
) )
} }

View File

@@ -1,24 +1,26 @@
import { import {
ActionIcon, ActionIcon,
Badge, Badge,
Center, Box,
Container, Container,
Group, Group,
Loader, Loader,
Pagination, Pagination,
Paper,
SegmentedControl, SegmentedControl,
Select, Select,
Stack, Stack,
Table, Table,
Text, Text,
Title, Title,
Tooltip,
} from '@mantine/core' } from '@mantine/core'
import { DatePickerInput, type DatesRangeValue } from '@mantine/dates' import { DatePickerInput, type DatesRangeValue } from '@mantine/dates'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import 'dayjs/locale/id' import 'dayjs/locale/id'
import { useMemo, useState } from 'react' import { useMemo, useState } from 'react'
import { createFileRoute } from '@tanstack/react-router' import { createFileRoute } from '@tanstack/react-router'
import { TbRefresh } from 'react-icons/tb' import { TbHistory, TbRefresh } from 'react-icons/tb'
import { DashboardLayout } from '@/frontend/components/DashboardLayout' import { DashboardLayout } from '@/frontend/components/DashboardLayout'
import useSWR from 'swr' import useSWR from 'swr'
import { API_URLS } from '../config/api' import { API_URLS } from '../config/api'
@@ -30,8 +32,16 @@ export const Route = createFileRoute('/logs')({
const fetcher = (url: string) => fetch(url, { credentials: 'include' }).then((r) => r.json()) const fetcher = (url: string) => fetch(url, { credentials: 'include' }).then((r) => r.json())
const LOG_TYPES = ['all', 'LOGIN', 'LOGOUT', 'CREATE', 'UPDATE', 'DELETE'] as const const LOG_TYPES = ['all', 'LOGIN', 'LOGOUT', 'CREATE', 'UPDATE', 'DELETE'] as const
const LOG_TYPE_LABEL: Record<string, string> = {
all: 'All',
LOGIN: 'Login',
LOGOUT: 'Logout',
CREATE: 'Create',
UPDATE: 'Update',
DELETE: 'Delete',
}
const LOG_TYPE_COLOR: Record<string, string> = { const LOG_TYPE_COLOR: Record<string, string> = {
LOGIN: 'green', LOGIN: 'teal',
LOGOUT: 'gray', LOGOUT: 'gray',
CREATE: 'blue', CREATE: 'blue',
UPDATE: 'yellow', UPDATE: 'yellow',
@@ -47,9 +57,9 @@ function GlobalLogsPage() {
const { data: operatorsData } = useSWR(API_URLS.getLogOperators(), fetcher) const { data: operatorsData } = useSWR(API_URLS.getLogOperators(), fetcher)
const operatorOptions = useMemo(() => { const operatorOptions = useMemo(() => {
if (!operatorsData || !Array.isArray(operatorsData)) return [{ value: 'all', label: 'Semua operator' }] if (!operatorsData || !Array.isArray(operatorsData)) return [{ value: 'all', label: 'All users' }]
return [ return [
{ value: 'all', label: 'Semua user' }, { value: 'all', label: 'All users' },
...operatorsData.map((op: any) => ({ value: op.id, label: op.name })), ...operatorsData.map((op: any) => ({ value: op.id, label: op.name })),
] ]
}, [operatorsData]) }, [operatorsData])
@@ -69,88 +79,153 @@ function GlobalLogsPage() {
return ( return (
<DashboardLayout> <DashboardLayout>
<Container size="xl" py="lg"> <Container size="xl" py="lg">
<Stack> <Stack gap="xl">
<Group justify="space-between"> <Group justify="space-between" align="flex-start">
<Title order={3}>Activity Logs</Title> <Stack gap={4}>
<ActionIcon variant="subtle" color="gray" onClick={() => mutate()}> <Title order={2} className="gradient-text">Activity Logs</Title>
<TbRefresh size={16} /> <Text size="sm" c="dimmed">
</ActionIcon> Track all user actions and system events across the platform.
</Text>
</Stack>
<Tooltip label="Refresh logs" withArrow>
<ActionIcon
variant="light"
color="brand-blue"
size="lg"
onClick={() => mutate()}
loading={isLoading}
>
<TbRefresh size={16} />
</ActionIcon>
</Tooltip>
</Group> </Group>
<Group gap="sm" wrap="wrap"> <Paper withBorder radius="xl" p="md" className="glass">
<Select <Stack gap="md">
placeholder="Filter user" <Group gap="sm" wrap="wrap" align="flex-end">
value={operatorId} <Select
onChange={(v) => { setOperatorId(v ?? 'all'); setPage(1) }} label="User"
data={operatorOptions} placeholder="All users"
w={180} value={operatorId}
clearable onChange={(v) => { setOperatorId(v ?? 'all'); setPage(1) }}
/> data={operatorOptions}
<DatePickerInput style={{ flex: 1, minWidth: 160 }}
type="range" clearable
placeholder="Filter tanggal" size="sm"
value={dateRange} />
onChange={(v) => { setDateRange(v); setPage(1) }} <DatePickerInput
locale="id" type="range"
valueFormat="DD MMM YYYY" label="Date range"
clearable placeholder="Pick a date range"
w={300} value={dateRange}
/> onChange={(v) => { setDateRange(v); setPage(1) }}
<SegmentedControl locale="id"
value={type} valueFormat="DD MMM YYYY"
onChange={(v) => { setType(v); setPage(1) }} clearable
data={LOG_TYPES.map((t) => ({ label: t === 'all' ? 'All' : t, value: t }))} style={{ flex: 2, minWidth: 220 }}
/> size="sm"
</Group> />
</Group>
<Stack gap={4}>
<Text size="xs" fw={500} c="dimmed">Action type</Text>
<Box style={{ overflowX: 'auto' }}>
<SegmentedControl
value={type}
onChange={(v) => { setType(v); setPage(1) }}
size="sm"
data={LOG_TYPES.map((t) => ({ label: LOG_TYPE_LABEL[t] ?? t, value: t }))}
/>
</Box>
</Stack>
</Stack>
</Paper>
{isLoading ? ( {isLoading && !data ? (
<Center py="xl"><Loader /></Center> <Group justify="center" py="xl">
<Loader type="dots" />
</Group>
) : ( ) : (
<> <Paper withBorder radius="2xl" className="glass" p="md">
<Table.ScrollContainer minWidth={600}> <Table.ScrollContainer minWidth={600}>
<Table striped highlightOnHover fz="xs" style={{ tableLayout: 'fixed', width: '100%' }}> <Table
className="data-table"
highlightOnHover
verticalSpacing="sm"
fz="sm"
style={{ tableLayout: 'fixed', width: '100%' }}
>
<colgroup> <colgroup>
<col style={{ width: 160 }} /> <col style={{ width: 155 }} />
<col style={{ width: 200 }} /> <col style={{ width: 210 }} />
<col style={{ width: 100 }} /> <col style={{ width: 105 }} />
<col /> <col />
</colgroup> </colgroup>
<Table.Thead> <Table.Thead>
<Table.Tr> <Table.Tr>
<Table.Th>Time</Table.Th> <Table.Th>Timestamp</Table.Th>
<Table.Th>Operator</Table.Th> <Table.Th>User</Table.Th>
<Table.Th>Type</Table.Th> <Table.Th>Action</Table.Th>
<Table.Th>Message</Table.Th> <Table.Th>Description</Table.Th>
</Table.Tr> </Table.Tr>
</Table.Thead> </Table.Thead>
<Table.Tbody> <Table.Tbody>
{logs.map((log: any) => ( {logs.map((log: any) => (
<Table.Tr key={log.id}> <Table.Tr key={log.id}>
<Table.Td style={{ whiteSpace: 'nowrap' }}> <Table.Td style={{ whiteSpace: 'nowrap' }}>
{new Date(log.createdAt).toLocaleString('id-ID')} <Stack gap={0}>
<Text size="xs" fw={500}>
{dayjs(log.createdAt).locale('id').format('D MMM YYYY')}
</Text>
<Text size="xs" c="dimmed">
{dayjs(log.createdAt).format('HH:mm:ss')}
</Text>
</Stack>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
{log.user ? ( {log.user ? (
<div> <Stack gap={0}>
<Text fw={500} truncate>{log.user.name}</Text> <Text size="sm" fw={600} truncate>{log.user.name}</Text>
<Text c="dimmed" truncate>{log.user.email}</Text> <Text size="xs" c="dimmed" truncate>{log.user.email}</Text>
</div> </Stack>
) : <Text c="dimmed"></Text>} ) : (
<Text c="dimmed" size="sm"></Text>
)}
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Badge color={LOG_TYPE_COLOR[log.type] ?? 'gray'} variant="light"> <Badge
{log.type} color={LOG_TYPE_COLOR[log.type] ?? 'gray'}
variant="light"
size="sm"
tt="capitalize"
>
{LOG_TYPE_LABEL[log.type] ?? log.type}
</Badge> </Badge>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Text>{log.message}</Text> <Tooltip
label={log.message}
multiline
maw={340}
withArrow
position="top-start"
disabled={(log.message?.length ?? 0) < 60}
>
<Text size="sm" lineClamp={2} style={{ cursor: 'default' }}>
{log.message}
</Text>
</Tooltip>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
))} ))}
{logs.length === 0 && ( {logs.length === 0 && (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={4}> <Table.Td colSpan={4}>
<Center py="xl"><Text c="dimmed">Belum ada log aktivitas</Text></Center> <Stack align="center" gap="xs" py="xl">
<TbHistory size={32} style={{ opacity: 0.25 }} />
<Text c="dimmed" size="sm">
No activity logs found for the selected filters.
</Text>
</Stack>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
)} )}
@@ -158,11 +233,11 @@ function GlobalLogsPage() {
</Table> </Table>
</Table.ScrollContainer> </Table.ScrollContainer>
{totalPages > 1 && ( {totalPages > 1 && (
<Center> <Group justify="center" mt="md">
<Pagination total={totalPages} value={page} onChange={setPage} size="sm" /> <Pagination total={totalPages} value={page} onChange={setPage} size="sm" />
</Center> </Group>
)} )}
</> </Paper>
)} )}
</Stack> </Stack>
</Container> </Container>

View File

@@ -11,6 +11,7 @@ import {
Divider, Divider,
Group, Group,
List, List,
Loader,
Modal, Modal,
Pagination, Pagination,
Paper, Paper,
@@ -41,6 +42,7 @@ import {
TbTrash, TbTrash,
TbUserCheck, TbUserCheck,
TbUserPlus, TbUserPlus,
TbUsers,
} from 'react-icons/tb' } from 'react-icons/tb'
import useSWR from 'swr' import useSWR from 'swr'
import { API_URLS } from '../config/api' import { API_URLS } from '../config/api'
@@ -52,45 +54,50 @@ export const Route = createFileRoute('/users')({
const fetcher = (url: string) => fetch(url).then((res) => res.json()) const fetcher = (url: string) => fetch(url).then((res) => res.json())
const getRoleColor = (role: string) => { const ROLE_COLOR: Record<string, string> = {
if (role === 'DEVELOPER') return 'violet' DEVELOPER: 'violet',
if (role === 'ADMIN') return 'brand-blue' ADMIN: 'brand-blue',
return 'gray' USER: 'gray',
}
const ROLE_LABEL: Record<string, string> = {
DEVELOPER: 'Developer',
ADMIN: 'Admin',
USER: 'User',
} }
const roles = [ const roles = [
{ {
name: 'DEVELOPER', name: 'DEVELOPER',
color: 'violet', color: 'violet',
description: 'Super admin dengan akses penuh ke seluruh sistem termasuk Dev Console.', description: 'Super admin with full system access, including the Dev Console.',
permissions: [ permissions: [
'Akses Dev Console (/dev)', 'Access Dev Console (/dev)',
'Manajemen user & role', 'User & role management',
'Kelola bug report & feedback', 'Manage bug reports & feedback',
'Lihat semua app & log aktivitas', 'View all apps & activity logs',
'Kelola versi & status aplikasi', 'Manage app versions & status',
'Hapus log sistem', 'Delete system logs',
], ],
}, },
{ {
name: 'ADMIN', name: 'ADMIN',
color: 'blue', color: 'blue',
description: 'Operator yang dapat mengelola aplikasi, bug, dan melihat log aktivitas.', description: 'Operator who can manage applications, bugs, and view activity logs.',
permissions: [ permissions: [
'Lihat & kelola semua aplikasi', 'View & manage all applications',
'Kelola bug report', 'Manage bug reports',
'Lihat log aktivitas', 'View activity logs',
'Lihat data user, desa, orders', 'View user, village, and order data',
'Update status village & produk', 'Update village & product status',
], ],
}, },
{ {
name: 'USER', name: 'USER',
color: 'gray', color: 'gray',
description: 'Akun baru yang belum disetujui. Menunggu approval dari Admin atau Developer.', description: 'New account pending approval. Awaiting review by an Admin or Developer.',
permissions: [ permissions: [
'Akses halaman profil', 'Access profile page',
'Lihat status persetujuan akun', 'View account approval status',
], ],
}, },
] ]
@@ -110,7 +117,7 @@ function UsersPage() {
const { data: stats, mutate: mutateStats } = useSWR(API_URLS.getOperatorStats(), fetcher) const { data: stats, mutate: mutateStats } = useSWR(API_URLS.getOperatorStats(), fetcher)
const { data: response, isLoading, mutate: mutateOperators } = useSWR( const { data: response, isLoading, mutate: mutateOperators } = useSWR(
API_URLS.getOperators(page, debouncedSearch), API_URLS.getOperators(page, debouncedSearch),
fetcher fetcher,
) )
const operators = response?.data || [] const operators = response?.data || []
@@ -118,19 +125,13 @@ function UsersPage() {
// ── Create User Modal ── // ── Create User Modal ──
const [createOpened, { open: openCreate, close: closeCreate }] = useDisclosure(false) const [createOpened, { open: openCreate, close: closeCreate }] = useDisclosure(false)
const [isCreating, setIsCreating] = useState(false) const [isCreating, setIsCreating] = useState(false)
const [createForm, setCreateForm] = useState({ const [createForm, setCreateForm] = useState({ name: '', email: '', password: '', role: 'ADMIN' })
name: '',
email: '',
password: '',
role: 'ADMIN',
})
const handleCreateUser = async () => { const handleCreateUser = async () => {
if (!createForm.name || !createForm.email || !createForm.password) { if (!createForm.name || !createForm.email || !createForm.password) {
notifications.show({ title: 'Validation Error', message: 'Please fill in all required fields.', color: 'red' }) notifications.show({ title: 'Validation Error', message: 'Please fill in all required fields.', color: 'red' })
return return
} }
setIsCreating(true) setIsCreating(true)
try { try {
const res = await fetch(API_URLS.createOperator(), { const res = await fetch(API_URLS.createOperator(), {
@@ -138,7 +139,6 @@ function UsersPage() {
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(createForm), body: JSON.stringify(createForm),
}) })
if (res.ok) { if (res.ok) {
notifications.show({ title: 'Success', message: 'User has been created.', color: 'teal', icon: <TbCircleCheck size={18} /> }) notifications.show({ title: 'Success', message: 'User has been created.', color: 'teal', icon: <TbCircleCheck size={18} /> })
mutateOperators() mutateOperators()
@@ -160,11 +160,7 @@ function UsersPage() {
const [editOpened, { open: openEdit, close: closeEdit }] = useDisclosure(false) const [editOpened, { open: openEdit, close: closeEdit }] = useDisclosure(false)
const [isEditing, setIsEditing] = useState(false) const [isEditing, setIsEditing] = useState(false)
const [editingUserId, setEditingUserId] = useState<string | null>(null) const [editingUserId, setEditingUserId] = useState<string | null>(null)
const [editForm, setEditForm] = useState({ const [editForm, setEditForm] = useState({ name: '', email: '', role: '' })
name: '',
email: '',
role: '',
})
const handleOpenEdit = (user: any) => { const handleOpenEdit = (user: any) => {
setEditingUserId(user.id) setEditingUserId(user.id)
@@ -174,7 +170,6 @@ function UsersPage() {
const handleEditUser = async () => { const handleEditUser = async () => {
if (!editingUserId || !editForm.name || !editForm.email) return if (!editingUserId || !editForm.name || !editForm.email) return
setIsEditing(true) setIsEditing(true)
try { try {
const res = await fetch(API_URLS.editOperator(editingUserId), { const res = await fetch(API_URLS.editOperator(editingUserId), {
@@ -182,7 +177,6 @@ function UsersPage() {
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(editForm), body: JSON.stringify(editForm),
}) })
if (res.ok) { if (res.ok) {
notifications.show({ title: 'Success', message: 'User has been updated.', color: 'teal', icon: <TbCircleCheck size={18} /> }) notifications.show({ title: 'Success', message: 'User has been updated.', color: 'teal', icon: <TbCircleCheck size={18} /> })
mutateOperators() mutateOperators()
@@ -190,14 +184,14 @@ function UsersPage() {
} else { } else {
throw new Error('Failed to update user') throw new Error('Failed to update user')
} }
} catch (e) { } catch {
notifications.show({ title: 'Error', message: 'Something went wrong.', color: 'red', icon: <TbCircleX size={18} /> }) notifications.show({ title: 'Error', message: 'Something went wrong.', color: 'red', icon: <TbCircleX size={18} /> })
} finally { } finally {
setIsEditing(false) setIsEditing(false)
} }
} }
// ── Delete User ── // ── Delete User Modal ──
const [deleteOpened, { open: openDelete, close: closeDelete }] = useDisclosure(false) const [deleteOpened, { open: openDelete, close: closeDelete }] = useDisclosure(false)
const [isDeleting, setIsDeleting] = useState(false) const [isDeleting, setIsDeleting] = useState(false)
const [deletingUser, setDeletingUser] = useState<any>(null) const [deletingUser, setDeletingUser] = useState<any>(null)
@@ -209,13 +203,9 @@ function UsersPage() {
const handleDeleteUser = async () => { const handleDeleteUser = async () => {
if (!deletingUser) return if (!deletingUser) return
setIsDeleting(true) setIsDeleting(true)
try { try {
const res = await fetch(API_URLS.deleteOperator(deletingUser.id), { const res = await fetch(API_URLS.deleteOperator(deletingUser.id), { method: 'DELETE' })
method: 'DELETE',
})
if (res.ok) { if (res.ok) {
notifications.show({ title: 'Success', message: 'User has been deleted.', color: 'teal', icon: <TbCircleCheck size={18} /> }) notifications.show({ title: 'Success', message: 'User has been deleted.', color: 'teal', icon: <TbCircleCheck size={18} /> })
mutateOperators() mutateOperators()
@@ -242,7 +232,7 @@ function UsersPage() {
body: JSON.stringify({ active: true }), body: JSON.stringify({ active: true }),
}) })
if (res.ok) { if (res.ok) {
notifications.show({ title: 'Success', message: `${user.name} telah diaktifkan kembali.`, color: 'teal', icon: <TbCircleCheck size={18} /> }) notifications.show({ title: 'Success', message: `${user.name} has been reactivated.`, color: 'teal', icon: <TbCircleCheck size={18} /> })
mutateOperators() mutateOperators()
mutateStats() mutateStats()
} else { } else {
@@ -258,39 +248,52 @@ function UsersPage() {
<DashboardLayout> <DashboardLayout>
<Container size="xl" py="lg"> <Container size="xl" py="lg">
<Stack gap="xl"> <Stack gap="xl">
<Group justify="space-between" align="center"> <Stack gap={4}>
<Stack gap={0}> <Title order={2} className="gradient-text">User Management</Title>
<Title order={2} className="gradient-text">Users</Title> <Text size="sm" c="dimmed">Manage platform users, security roles, and access control.</Text>
<Text size="sm" c="dimmed">Manage system users, security roles, and application access control.</Text> </Stack>
</Stack>
</Group>
<SimpleGrid cols={{ base: 1, sm: 3 }} spacing="lg"> <SimpleGrid cols={{ base: 1, sm: 3 }} spacing="lg">
<StatsCard title="Total Staff" value={stats?.totalStaff ?? 0} icon={TbUserCheck} color="brand-blue" /> <StatsCard
<StatsCard title="Active Now" value={stats?.activeNow ?? 0} icon={TbAccessPoint} color="teal" /> title="Total Staff"
<StatsCard title="Security Roles" value={stats?.rolesCount ?? 0} icon={TbShieldCheck} color="purple-primary" /> value={stats?.totalStaff ?? 0}
description="Registered platform users"
icon={TbUserCheck}
color="brand-blue"
/>
<StatsCard
title="Active Now"
value={stats?.activeNow ?? 0}
description="Users with active sessions"
icon={TbAccessPoint}
color="teal"
/>
<StatsCard
title="Security Roles"
value={stats?.rolesCount ?? 0}
description="Defined permission levels"
icon={TbShieldCheck}
color="purple-primary"
/>
</SimpleGrid> </SimpleGrid>
<Tabs defaultValue="users" color="brand-blue" variant="pills" radius="md"> <Tabs defaultValue="users" color="brand-blue" variant="pills" radius="md">
<Tabs.List> <Tabs.List>
<Tabs.Tab value="users" leftSection={<TbUserCheck size={16} />}>User Management</Tabs.Tab> <Tabs.Tab value="users" leftSection={<TbUserCheck size={16} />}>User Management</Tabs.Tab>
<Tabs.Tab value="roles" leftSection={<TbShieldCheck size={16} />}>Role Management</Tabs.Tab> <Tabs.Tab value="roles" leftSection={<TbShieldCheck size={16} />}>Role Reference</Tabs.Tab>
</Tabs.List> </Tabs.List>
<Tabs.Panel value="users" pt="xl"> <Tabs.Panel value="users" pt="xl">
<Stack gap="md"> <Stack gap="md">
<Group justify="space-between"> <Group justify="space-between">
<TextInput <TextInput
placeholder="Search users..." placeholder="Search by name or email..."
leftSection={<TbSearch size={16} />} leftSection={<TbSearch size={16} />}
radius="md" radius="md"
w={350} w={320}
variant="filled" variant="filled"
value={search} value={search}
onChange={(e) => { onChange={(e) => { setSearch(e.currentTarget.value); setPage(1) }}
setSearch(e.currentTarget.value)
setPage(1)
}}
/> />
{isDeveloper && ( {isDeveloper && (
<Button <Button
@@ -298,6 +301,7 @@ function UsersPage() {
gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }} gradient={{ from: '#2563EB', to: '#7C3AED', deg: 135 }}
leftSection={<TbPlus size={18} />} leftSection={<TbPlus size={18} />}
radius="md" radius="md"
size="sm"
onClick={openCreate} onClick={openCreate}
> >
Add New User Add New User
@@ -305,36 +309,47 @@ function UsersPage() {
)} )}
</Group> </Group>
<Paper withBorder radius="2xl" className="glass" p={0} style={{ overflow: 'hidden' }}> <Paper withBorder radius="2xl" className="glass" p={0} style={{ overflowX: 'auto' }}>
<Table.ScrollContainer minWidth={480}>
<Table className="data-table" verticalSpacing="md" highlightOnHover> <Table className="data-table" verticalSpacing="md" highlightOnHover>
<Table.Thead> <Table.Thead>
<Table.Tr> <Table.Tr>
<Table.Th>Name & Contact</Table.Th> <Table.Th>Name & Contact</Table.Th>
<Table.Th>Role</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Role</Table.Th>
<Table.Th>Joined Date</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Joined</Table.Th>
<Table.Th>Actions</Table.Th> <Table.Th style={{ whiteSpace: 'nowrap' }}>Actions</Table.Th>
</Table.Tr> </Table.Tr>
</Table.Thead> </Table.Thead>
<Table.Tbody> <Table.Tbody>
{isLoading ? ( {isLoading ? (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={4} align="center"> <Table.Td colSpan={4}>
<Text size="sm" c="dimmed" py="xl">Loading user data...</Text> <Group justify="center" py="xl">
<Loader size="sm" type="dots" />
</Group>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
) : operators.length === 0 ? ( ) : operators.length === 0 ? (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={4} align="center"> <Table.Td colSpan={4}>
<Text size="sm" c="dimmed" py="xl">No users found.</Text> <Stack align="center" gap="xs" py="xl">
<TbUsers size={32} style={{ opacity: 0.25 }} />
<Text size="sm" c="dimmed">No users found.</Text>
</Stack>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
) : ( ) : (
operators.map((user: any) => ( operators.map((user: any) => (
<Table.Tr key={user.id}> <Table.Tr key={user.id}>
<Table.Td style={{ opacity: user.active === false ? 0.45 : 1 }}> <Table.Td style={{ opacity: user.active === false ? 0.45 : 1 }}>
<Group gap="sm"> <Group gap="sm" wrap="nowrap">
<Box style={{ position: 'relative' }}> <Box style={{ position: 'relative', flexShrink: 0 }}>
<Avatar size="sm" radius="xl" color={user.active === false ? 'gray' : getRoleColor(user.role)} src={user.image}> <Avatar
size="sm"
radius="xl"
color={user.active === false ? 'gray' : ROLE_COLOR[user.role] ?? 'gray'}
src={user.image}
>
{user.name.charAt(0)} {user.name.charAt(0)}
</Avatar> </Avatar>
{user.active === false && ( {user.active === false && (
@@ -350,7 +365,9 @@ function UsersPage() {
</Box> </Box>
<Stack gap={0}> <Stack gap={0}>
<Group gap={6}> <Group gap={6}>
<Text fw={600} size="sm" c={user.active === false ? 'dimmed' : undefined}>{user.name}</Text> <Text fw={600} size="sm" c={user.active === false ? 'dimmed' : undefined}>
{user.name}
</Text>
{user.active === false && ( {user.active === false && (
<Badge size="xs" color="red" variant="light">Inactive</Badge> <Badge size="xs" color="red" variant="light">Inactive</Badge>
)} )}
@@ -360,31 +377,61 @@ function UsersPage() {
</Group> </Group>
</Table.Td> </Table.Td>
<Table.Td style={{ opacity: user.active === false ? 0.45 : 1 }}> <Table.Td style={{ opacity: user.active === false ? 0.45 : 1 }}>
<Badge variant="light" color={user.active === false ? 'gray' : getRoleColor(user.role)}> <Badge
{user.role} variant="light"
size="sm"
color={user.active === false ? 'gray' : ROLE_COLOR[user.role] ?? 'gray'}
>
{ROLE_LABEL[user.role] ?? user.role}
</Badge> </Badge>
</Table.Td> </Table.Td>
<Table.Td style={{ opacity: user.active === false ? 0.45 : 1 }}> <Table.Td style={{ opacity: user.active === false ? 0.45 : 1, whiteSpace: 'nowrap' }}>
<Text size="xs" fw={500} c={user.active === false ? 'dimmed' : undefined}> <Text size="xs" fw={500} c={user.active === false ? 'dimmed' : undefined}>
{new Date(user.createdAt).toLocaleDateString('en-GB', { day: 'numeric', month: 'short', year: 'numeric' })} {new Date(user.createdAt).toLocaleDateString('en-GB', {
day: 'numeric',
month: 'short',
year: 'numeric',
})}
</Text> </Text>
</Table.Td> </Table.Td>
<Table.Td> <Table.Td>
<Group gap="xs"> <Group gap="xs">
{user.active === false ? ( {user.active === false ? (
<Tooltip label="Aktifkan user" withArrow> <Tooltip label="Reactivate user" withArrow>
<ActionIcon disabled={!isDeveloper} variant="light" size="sm" color="teal" onClick={() => handleActivateUser(user)}> <ActionIcon
disabled={!isDeveloper}
variant="light"
size="sm"
color="teal"
onClick={() => handleActivateUser(user)}
>
<TbUserPlus size={14} /> <TbUserPlus size={14} />
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
) : ( ) : (
<> <>
<ActionIcon disabled={!isDeveloper} variant="light" size="sm" color="blue" onClick={() => handleOpenEdit(user)}> <Tooltip label="Edit user" withArrow>
<TbPencil size={14} /> <ActionIcon
</ActionIcon> disabled={!isDeveloper}
<ActionIcon disabled={!isDeveloper} variant="light" size="sm" color="red" onClick={() => handleOpenDelete(user)}> variant="light"
<TbTrash size={14} /> size="sm"
</ActionIcon> color="blue"
onClick={() => handleOpenEdit(user)}
>
<TbPencil size={14} />
</ActionIcon>
</Tooltip>
<Tooltip label="Delete user" withArrow>
<ActionIcon
disabled={!isDeveloper}
variant="light"
size="sm"
color="red"
onClick={() => handleOpenDelete(user)}
>
<TbTrash size={14} />
</ActionIcon>
</Tooltip>
</> </>
)} )}
</Group> </Group>
@@ -394,16 +441,12 @@ function UsersPage() {
)} )}
</Table.Tbody> </Table.Tbody>
</Table> </Table>
</Table.ScrollContainer>
</Paper> </Paper>
{response?.totalPages > 1 && ( {response?.totalPages > 1 && (
<Group justify="center" mt="md"> <Group justify="center" mt="md">
<Pagination <Pagination total={response.totalPages} value={page} onChange={setPage} size="sm" radius="md" />
total={response.totalPages}
value={page}
onChange={setPage}
radius="md"
/>
</Group> </Group>
)} )}
</Stack> </Stack>
@@ -414,20 +457,18 @@ function UsersPage() {
{roles.map((role) => ( {roles.map((role) => (
<Card key={role.name} withBorder radius="2xl" padding="xl" className="glass"> <Card key={role.name} withBorder radius="2xl" padding="xl" className="glass">
<Stack gap="md"> <Stack gap="md">
<Group justify="space-between"> <ThemeIcon size="xl" radius="md" color={role.color} variant="light">
<ThemeIcon size="xl" radius="md" color={role.color} variant="light"> <TbShieldCheck size={28} />
<TbShieldCheck size={28} /> </ThemeIcon>
</ThemeIcon>
</Group>
<Stack gap={4}> <Stack gap={4}>
<Title order={4}>{role.name}</Title> <Title order={4}>{ROLE_LABEL[role.name] ?? role.name}</Title>
<Text size="sm" c="dimmed">{role.description}</Text> <Text size="sm" c="dimmed">{role.description}</Text>
</Stack> </Stack>
<Divider /> <Divider />
<Text size="xs" fw={700} c="dimmed" style={{ textTransform: 'uppercase' }}>Key Permissions</Text> <Text size="xs" fw={700} c="dimmed" tt="uppercase">Key Permissions</Text>
<List <List
spacing="xs" spacing="xs"
size="sm" size="sm"
@@ -442,10 +483,6 @@ function UsersPage() {
<List.Item key={p}>{p}</List.Item> <List.Item key={p}>{p}</List.Item>
))} ))}
</List> </List>
{/* <Button fullWidth variant="light" color={role.color} mt="md" radius="md">
Edit Permissions
</Button> */}
</Stack> </Stack>
</Card> </Card>
))} ))}
@@ -460,7 +497,7 @@ function UsersPage() {
opened={createOpened} opened={createOpened}
onClose={closeCreate} onClose={closeCreate}
title={<Text fw={700} size="lg">Add New User</Text>} title={<Text fw={700} size="lg">Add New User</Text>}
radius="xl" radius="md"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }} overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
<Stack gap="md"> <Stack gap="md">
@@ -492,7 +529,7 @@ function UsersPage() {
{ value: 'DEVELOPER', label: 'Developer' }, { value: 'DEVELOPER', label: 'Developer' },
]} ]}
value={createForm.role} value={createForm.role}
onChange={(val) => setCreateForm({ ...createForm, role: val || 'USER' })} onChange={(val) => setCreateForm({ ...createForm, role: val || 'ADMIN' })}
/> />
<Button <Button
fullWidth fullWidth
@@ -512,7 +549,7 @@ function UsersPage() {
opened={editOpened} opened={editOpened}
onClose={closeEdit} onClose={closeEdit}
title={<Text fw={700} size="lg">Edit User</Text>} title={<Text fw={700} size="lg">Edit User</Text>}
radius="xl" radius="md"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }} overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
<Stack gap="md"> <Stack gap="md">
@@ -558,21 +595,19 @@ function UsersPage() {
opened={deleteOpened} opened={deleteOpened}
onClose={closeDelete} onClose={closeDelete}
title={<Text fw={700} size="lg">Delete User</Text>} title={<Text fw={700} size="lg">Delete User</Text>}
radius="xl" radius="md"
size="sm" size="sm"
overlayProps={{ backgroundOpacity: 0.55, blur: 3 }} overlayProps={{ backgroundOpacity: 0.55, blur: 3 }}
> >
<Stack gap="md"> <Stack gap="md">
<Text size="sm"> <Text size="sm">
Are you sure you want to delete <Text component="span" fw={700}>{deletingUser?.name}</Text>? This action cannot be undone. Are you sure you want to delete{' '}
<Text component="span" fw={700}>{deletingUser?.name}</Text>?
This action cannot be undone.
</Text> </Text>
<Group justify="flex-end" mt="md"> <Group justify="flex-end" mt="md">
<Button variant="subtle" color="gray" onClick={closeDelete}> <Button variant="subtle" color="gray" onClick={closeDelete}>Cancel</Button>
Cancel <Button color="red" loading={isDeleting} onClick={handleDeleteUser}>Delete User</Button>
</Button>
<Button color="red" loading={isDeleting} onClick={handleDeleteUser}>
Delete User
</Button>
</Group> </Group>
</Stack> </Stack>
</Modal> </Modal>

View File

@@ -2,6 +2,7 @@ import type { ServerWebSocket } from 'bun'
const connections = new Map<string, Set<ServerWebSocket<{ userId: string }>>>() const connections = new Map<string, Set<ServerWebSocket<{ userId: string }>>>()
const adminSubs = new Set<ServerWebSocket<{ userId: string }>>() const adminSubs = new Set<ServerWebSocket<{ userId: string }>>()
const notifSubs = new Set<ServerWebSocket<{ userId: string }>>()
export function getOnlineUserIds(): string[] { export function getOnlineUserIds(): string[] {
return Array.from(connections.keys()) return Array.from(connections.keys())
@@ -13,7 +14,12 @@ function broadcast() {
for (const ws of adminSubs) ws.send(msg) for (const ws of adminSubs) ws.send(msg)
} }
export function addConnection(ws: ServerWebSocket<{ userId: string }>, userId: string, isAdmin: boolean) { export function addConnection(
ws: ServerWebSocket<{ userId: string }>,
userId: string,
isAdmin: boolean,
canReceiveNotifs: boolean,
) {
let set = connections.get(userId) let set = connections.get(userId)
if (!set) { if (!set) {
set = new Set() set = new Set()
@@ -24,6 +30,7 @@ export function addConnection(ws: ServerWebSocket<{ userId: string }>, userId: s
adminSubs.add(ws) adminSubs.add(ws)
ws.send(JSON.stringify({ type: 'presence', online: getOnlineUserIds() })) ws.send(JSON.stringify({ type: 'presence', online: getOnlineUserIds() }))
} }
if (canReceiveNotifs) notifSubs.add(ws)
broadcast() broadcast()
} }
@@ -32,6 +39,11 @@ export function broadcastToAdmins(message: object) {
for (const ws of adminSubs) ws.send(msg) for (const ws of adminSubs) ws.send(msg)
} }
export function broadcastNotification(message: object) {
const msg = JSON.stringify(message)
for (const ws of notifSubs) ws.send(msg)
}
export function removeConnection(ws: ServerWebSocket<{ userId: string }>) { export function removeConnection(ws: ServerWebSocket<{ userId: string }>) {
const userId = ws.data.userId const userId = ws.data.userId
const set = connections.get(userId) const set = connections.get(userId)
@@ -40,5 +52,6 @@ export function removeConnection(ws: ServerWebSocket<{ userId: string }>) {
if (set.size === 0) connections.delete(userId) if (set.size === 0) connections.delete(userId)
} }
adminSubs.delete(ws) adminSubs.delete(ws)
notifSubs.delete(ws)
broadcast() broadcast()
} }

View File

@@ -1,252 +0,0 @@
#!/usr/bin/env bun
import { promises as fs } from 'fs';
import * as os from 'os';
import * as path from 'path';
// --- Constants ---
const CONFIG_FILE = path.join(os.homedir(), '.note.conf');
// --- Types ---
interface Config {
TOKEN?: string;
REPO?: string;
URL?: string;
}
export const defaultConfigSF: Config = {
TOKEN: process.env.SF_TOKEN,
REPO: process.env.SF_REPO,
URL: process.env.SF_URL,
}
export async function loadConfig(): Promise<Config> {
if (!(await fs.stat(CONFIG_FILE)).isFile()) {
console.error(`⚠️ Config file not found at ${CONFIG_FILE}`);
console.error('Run: bun note.ts config to create/edit it.');
process.exit(1);
}
const configContent = await fs.readFile(CONFIG_FILE, 'utf8');
const config: Config = {};
configContent.split('\n').forEach((line) => {
const trimmed = line.trim();
if (!trimmed || trimmed.startsWith('#')) return;
const [key, ...valueParts] = trimmed.split('=');
if (key && valueParts.length > 0) {
let value = valueParts.join('=').trim();
if (
(value.startsWith('"') && value.endsWith('"')) ||
(value.startsWith("'") && value.endsWith("'"))
) {
value = value.slice(1, -1);
}
config[key as keyof Config] = value;
}
});
if (!config.TOKEN || !config.REPO || !config.URL) {
console.error(`❌ Config invalid. Please set TOKEN, REPO, and URL inside ${CONFIG_FILE}`);
process.exit(1);
}
return config;
}
// --- HTTP Helpers ---
export async function fetchWithAuth(config: Config, url: string, options: RequestInit = {}): Promise<Response> {
const headers = {
Authorization: `Token ${config.TOKEN}`,
...options.headers,
};
const response = await fetch(url, { ...options, headers });
if (!response.ok) {
console.error(`❌ Request failed: ${response.status} ${response.statusText}`);
console.error(`🔍 URL: ${url}`);
console.error(`🔍 Headers:`, headers);
try {
const errorText = await response.text();
console.error(`🔍 Response body: ${errorText}`);
} catch {
console.error('🔍 Could not read response body');
}
}
return response;
}
// --- Commands ---
export async function testConnection(config: Config): Promise<string> {
try {
const response = await fetchWithAuth(config, `${config.URL}/ping/`);
return `✅ API connection successful: ${await response.text()}`
} catch {
// return '⚠️ API ping failed, trying repo access...'
try {
await fetchWithAuth(config, `${config.URL}/${config.REPO}/`);
return `✅ Repo access successful`
} catch {
return '❌ Both API ping and repo access failed'
}
}
}
export async function listFiles(config: Config): Promise<{ name: string }[]> {
const url = `${config.URL}/${config.REPO}/dir/?p=/`;
const response = await fetchWithAuth(config, url);
try {
const files = (await response.json()) as { name: string }[];
return files
} catch {
console.error('❌ Failed to parse response');
process.exit(1);
}
}
export async function catFile(config: Config, folder: string, fileName: string): Promise<ArrayBuffer> {
const downloadUrlResponse = await fetchWithAuth(config, `${config.URL}/${config.REPO}/file/?p=/${folder}/${fileName}`);
const downloadUrl = (await downloadUrlResponse.text()).replace(/"/g, '');
// Download file sebagai binary, BUKAN text
const fileResponse = await fetchWithAuth(config, downloadUrl);
const buffer = await fileResponse.arrayBuffer();
return buffer;
}
export async function uploadFile(config: Config, file: File, folder: string): Promise<string> {
const remoteName = path.basename(file.name);
// 1. Dapatkan upload link (pakai Authorization)
const uploadUrlResponse = await fetchWithAuth(
config,
`${config.URL}/${config.REPO}/upload-link/`
);
const uploadUrl = (await uploadUrlResponse.text()).replace(/"/g, "");
// 2. Siapkan form-data
const formData = new FormData();
formData.append("parent_dir", "/");
formData.append("relative_path", folder); // tanpa slash di akhir
formData.append("file", file, remoteName); // file langsung, jangan pakai Blob
// 3. Upload file TANPA Authorization header, token di query param
const res = await fetch(`${uploadUrl}?token=${config.TOKEN}`, {
method: "POST",
body: formData,
});
const text = await res.text();
if (!res.ok) return 'gagal'
return `✅ Uploaded ${file.name} successfully`;
}
export async function uploadFileBase64(config: Config, base64File: { name: string; data: string; }): Promise<string> {
const remoteName = path.basename(base64File.name);
// 1. Dapatkan upload link (pakai Authorization)
const uploadUrlResponse = await fetchWithAuth(
config,
`${config.URL}/${config.REPO}/upload-link/`
);
const uploadUrl = (await uploadUrlResponse.text()).replace(/"/g, "");
// 2. Konversi base64 ke Blob
const binary = Buffer.from(base64File.data, "base64");
const blob = new Blob([binary]);
// 3. Siapkan form-data
const formData = new FormData();
formData.append("parent_dir", "/");
formData.append("relative_path", "syarat-dokumen"); // tanpa slash di akhir
formData.append("file", blob, remoteName);
// 4. Upload file TANPA Authorization header, token di query param
const res = await fetch(`${uploadUrl}?token=${config.TOKEN}`, {
method: "POST",
body: formData,
});
const text = await res.text();
if (!res.ok) throw new Error(`Upload failed: ${text}`);
return `✅ Uploaded ${base64File.name} successfully`;
}
export async function uploadFileToFolder(config: Config, base64File: { name: string; data: string; }, folder: 'syarat-dokumen' | 'pengaduan'): Promise<string> {
const remoteName = path.basename(base64File.name);
// 1. Dapatkan upload link (pakai Authorization)
const uploadUrlResponse = await fetchWithAuth(
config,
`${config.URL}/${config.REPO}/upload-link/`
);
const uploadUrl = (await uploadUrlResponse.text()).replace(/"/g, "");
// 2. Konversi base64 ke Blob
const binary = Buffer.from(base64File.data, "base64");
const blob = new Blob([binary]);
// 3. Siapkan form-data
const formData = new FormData();
formData.append("parent_dir", "/");
formData.append("relative_path", folder); // tanpa slash di akhir
formData.append("file", blob, remoteName);
// 4. Upload file TANPA Authorization header, token di query param
const res = await fetch(`${uploadUrl}?token=${config.TOKEN}`, {
method: "POST",
body: formData,
});
const text = await res.text();
if (!res.ok) throw new Error(`Upload failed: ${text}`);
return `✅ Uploaded ${base64File.name} successfully`;
}
export async function removeFile(config: Config, fileName: string, folder: string): Promise<string> {
const res = await fetchWithAuth(config, `${config.URL}/${config.REPO}/file/?p=/${folder}/${fileName}`, { method: 'DELETE' });
if (!res.ok) return 'gagal menghapus file';
return `🗑️ Removed ${fileName}`
}
export async function moveFile(config: Config, oldName: string, newName: string): Promise<string> {
const url = `${config.URL}/${config.REPO}/file/?p=/${oldName}`;
const formData = new FormData();
formData.append('operation', 'rename');
formData.append('newname', newName);
await fetchWithAuth(config, url, { method: 'POST', body: formData });
return `✏️ Renamed ${oldName}${newName}`
}
export async function downloadFile(config: Config, fileName: string, folder: string, localFile?: string): Promise<string> {
const localName = localFile || fileName;
// 🔹 gabungkan path folder + file
const filePath = `/${folder}/${fileName}`.replace(/\/+/g, "/");
// 🔹 encode path agar aman (spasi, dll)
const params = new URLSearchParams({
p: filePath,
});
const downloadUrlResponse = await fetchWithAuth(config, `${config.URL}/${config.REPO}/file/?${params.toString()}`);
if (!downloadUrlResponse.ok)
return 'gagal'
const downloadUrl = (await downloadUrlResponse.text()).replace(/"/g, '');
const buffer = Buffer.from(await (await fetchWithAuth(config, downloadUrl)).arrayBuffer());
await fs.writeFile(localName, buffer);
return `⬇️ Downloaded ${fileName}${localName}`
}
export async function getFileLink(config: Config, fileName: string): Promise<string> {
const downloadUrlResponse = await fetchWithAuth(config, `${config.URL}/${config.REPO}/file/?p=/${fileName}`);
return `🔗 Link for ${fileName}:\n${(await downloadUrlResponse.text()).replace(/"/g, '')}`
}

View File

@@ -1 +1,17 @@
<svg id="Bun" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 70"><title>Bun Logo</title><path id="Shadow" d="M71.09,20.74c-.16-.17-.33-.34-.5-.5s-.33-.34-.5-.5-.33-.34-.5-.5-.33-.34-.5-.5-.33-.34-.5-.5-.33-.34-.5-.5-.33-.34-.5-.5A26.46,26.46,0,0,1,75.5,35.7c0,16.57-16.82,30.05-37.5,30.05-11.58,0-21.94-4.23-28.83-10.86l.5.5.5.5.5.5.5.5.5.5.5.5.5.5C19.55,65.3,30.14,69.75,42,69.75c20.68,0,37.5-13.48,37.5-30C79.5,32.69,76.46,26,71.09,20.74Z"/><g id="Body"><path id="Background" d="M73,35.7c0,15.21-15.67,27.54-35,27.54S3,50.91,3,35.7C3,26.27,9,17.94,18.22,13S33.18,3,38,3s8.94,4.13,19.78,10C67,17.94,73,26.27,73,35.7Z" style="fill:#fbf0df"/><path id="Bottom_Shadow" data-name="Bottom Shadow" d="M73,35.7a21.67,21.67,0,0,0-.8-5.78c-2.73,33.3-43.35,34.9-59.32,24.94A40,40,0,0,0,38,63.24C57.3,63.24,73,50.89,73,35.7Z" style="fill:#f6dece"/><path id="Light_Shine" data-name="Light Shine" d="M24.53,11.17C29,8.49,34.94,3.46,40.78,3.45A9.29,9.29,0,0,0,38,3c-2.42,0-5,1.25-8.25,3.13-1.13.66-2.3,1.39-3.54,2.15-2.33,1.44-5,3.07-8,4.7C8.69,18.13,3,26.62,3,35.7c0,.4,0,.8,0,1.19C9.06,15.48,20.07,13.85,24.53,11.17Z" style="fill:#fffefc"/><path id="Top" d="M35.12,5.53A16.41,16.41,0,0,1,29.49,18c-.28.25-.06.73.3.59,3.37-1.31,7.92-5.23,6-13.14C35.71,5,35.12,5.12,35.12,5.53Zm2.27,0A16.24,16.24,0,0,1,39,19c-.12.35.31.65.55.36C41.74,16.56,43.65,11,37.93,5,37.64,4.74,37.19,5.14,37.39,5.49Zm2.76-.17A16.42,16.42,0,0,1,47,17.12a.33.33,0,0,0,.65.11c.92-3.49.4-9.44-7.17-12.53C40.08,4.54,39.82,5.08,40.15,5.32ZM21.69,15.76a16.94,16.94,0,0,0,10.47-9c.18-.36.75-.22.66.18-1.73,8-7.52,9.67-11.12,9.45C21.32,16.4,21.33,15.87,21.69,15.76Z" style="fill:#ccbea7;fill-rule:evenodd"/><path id="Outline" d="M38,65.75C17.32,65.75.5,52.27.5,35.7c0-10,6.18-19.33,16.53-24.92,3-1.6,5.57-3.21,7.86-4.62,1.26-.78,2.45-1.51,3.6-2.19C32,1.89,35,.5,38,.5s5.62,1.2,8.9,3.14c1,.57,2,1.19,3.07,1.87,2.49,1.54,5.3,3.28,9,5.27C69.32,16.37,75.5,25.69,75.5,35.7,75.5,52.27,58.68,65.75,38,65.75ZM38,3c-2.42,0-5,1.25-8.25,3.13-1.13.66-2.3,1.39-3.54,2.15-2.33,1.44-5,3.07-8,4.7C8.69,18.13,3,26.62,3,35.7,3,50.89,18.7,63.25,38,63.25S73,50.89,73,35.7C73,26.62,67.31,18.13,57.78,13,54,11,51.05,9.12,48.66,7.64c-1.09-.67-2.09-1.29-3-1.84C42.63,4,40.42,3,38,3Z"/></g><g id="Mouth"><g id="Background-2" data-name="Background"><path d="M45.05,43a8.93,8.93,0,0,1-2.92,4.71,6.81,6.81,0,0,1-4,1.88A6.84,6.84,0,0,1,34,47.71,8.93,8.93,0,0,1,31.12,43a.72.72,0,0,1,.8-.81H44.26A.72.72,0,0,1,45.05,43Z" style="fill:#b71422"/></g><g id="Tongue"><path id="Background-3" data-name="Background" d="M34,47.79a6.91,6.91,0,0,0,4.12,1.9,6.91,6.91,0,0,0,4.11-1.9,10.63,10.63,0,0,0,1-1.07,6.83,6.83,0,0,0-4.9-2.31,6.15,6.15,0,0,0-5,2.78C33.56,47.4,33.76,47.6,34,47.79Z" style="fill:#ff6164"/><path id="Outline-2" data-name="Outline" d="M34.16,47a5.36,5.36,0,0,1,4.19-2.08,6,6,0,0,1,4,1.69c.23-.25.45-.51.66-.77a7,7,0,0,0-4.71-1.93,6.36,6.36,0,0,0-4.89,2.36A9.53,9.53,0,0,0,34.16,47Z"/></g><path id="Outline-3" data-name="Outline" d="M38.09,50.19a7.42,7.42,0,0,1-4.45-2,9.52,9.52,0,0,1-3.11-5.05,1.2,1.2,0,0,1,.26-1,1.41,1.41,0,0,1,1.13-.51H44.26a1.44,1.44,0,0,1,1.13.51,1.19,1.19,0,0,1,.25,1h0a9.52,9.52,0,0,1-3.11,5.05A7.42,7.42,0,0,1,38.09,50.19Zm-6.17-7.4c-.16,0-.2.07-.21.09a8.29,8.29,0,0,0,2.73,4.37A6.23,6.23,0,0,0,38.09,49a6.28,6.28,0,0,0,3.65-1.73,8.3,8.3,0,0,0,2.72-4.37.21.21,0,0,0-.2-.09Z"/></g><g id="Face"><ellipse id="Right_Blush" data-name="Right Blush" cx="53.22" cy="40.18" rx="5.85" ry="3.44" style="fill:#febbd0"/><ellipse id="Left_Bluch" data-name="Left Bluch" cx="22.95" cy="40.18" rx="5.85" ry="3.44" style="fill:#febbd0"/><path id="Eyes" d="M25.7,38.8a5.51,5.51,0,1,0-5.5-5.51A5.51,5.51,0,0,0,25.7,38.8Zm24.77,0A5.51,5.51,0,1,0,45,33.29,5.5,5.5,0,0,0,50.47,38.8Z" style="fill-rule:evenodd"/><path id="Iris" d="M24,33.64a2.07,2.07,0,1,0-2.06-2.07A2.07,2.07,0,0,0,24,33.64Zm24.77,0a2.07,2.07,0,1,0-2.06-2.07A2.07,2.07,0,0,0,48.75,33.64Z" style="fill:#fff;fill-rule:evenodd"/></g></svg> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none">
<defs>
<linearGradient id="g" x1="0" y1="0" x2="32" y2="32" gradientUnits="userSpaceOnUse">
<stop stop-color="#2563EB"/>
<stop offset="1" stop-color="#7C3AED"/>
</linearGradient>
</defs>
<rect width="32" height="32" rx="7" fill="url(#g)"/>
<polyline
points="3,16 9,16 12,8 16,24 19,16 29,16"
stroke="white"
stroke-width="2.2"
stroke-linecap="round"
stroke-linejoin="round"
fill="none"
/>
</svg>

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 522 B