urieljareth/AgendaPro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rebrand AgendaPro -> AgendaMax + calendar fixes + current-week demo seed

Browse Source 
- Rebrand all user-facing text to AgendaMax
- Fix sidebar scrolling: card container no longer overflows html (flex h-full min-h-0)
- Fix calendar toolbar hover: active buttons keep readable contrast
- Sticky calendar toolbar (month/week/day always visible on scroll)
- Seed guarantees 2-4 appointments per day for current week (Mon-Sat)
This commit is contained in:
AgendaPro Dev
2026-07-27 10:11:16 -06:00
parent 4227db0c8b
commit d796538fd9
57 changed files with 2477 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/routes/dashboard.ts
+141 -72
View File
@@ -2,73 +2,114 @@ import { Router } from "express";
import { db } from "../db.ts";
import type { AuthedRequest } from "../lib/auth.ts";
import { ownerOnly } from "../lib/auth.ts";
import {
bizDateISO,
bizDayBoundsSqlite,
bizDayBoundsIso,
toIsoUtc,
} from "../lib/time.ts";
import { cancelRate, noShowRate, completionRate } from "../lib/metrics.ts";
export const dashboardRouter = Router();
dashboardRouter.use(ownerOnly);
const DEFAULT_TZ = "America/Mexico_City";
/** Fetch the business timezone once per handler. */
function bizTz(bid: number | null): string {
const row = db.prepare(`SELECT timezone t FROM businesses WHERE id = ?`).get(bid) as { t?: string } | undefined;
return row?.t || DEFAULT_TZ;
}
/** Clamp the range query param into [7, 120], default 30. */
function clampRange(raw: unknown): number {
const n = Number(raw);
if (!Number.isFinite(n) || n <= 0) return 30;
return Math.min(120, Math.max(7, Math.round(n)));
}
dashboardRouter.get("/overview", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const scalar = (sql: string, ...args: any[]) => (db.prepare(sql).get(...args) as any)?.v ?? 0;
// Business-local windows, expressed as canonical SQLite UTC strings.
// created_at is stored in a MIXED format (ISO-Z from seed, space from app default),
// so we wrap it with datetime() for correct chronological comparison. start_at is
// consistently ISO-Z, so it compares directly against ISO-Z bounds.
const todaySql = bizDayBoundsSqlite(tz, 0);
const rangeStart = bizDayBoundsSqlite(tz, -range).start; // range days ago, biz-local midnight
const prevStart = bizDayBoundsSqlite(tz, -range * 2).start; // preceding equal-length window
const todayIso = bizDayBoundsIso(tz, 0);
const weekStartIso = bizDayBoundsIso(tz, -7).start;
const rangeStartIso = bizDayBoundsIso(tz, -range).start;
const nowIso = toIsoUtc(new Date());
const revenue_today = scalar(
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets WHERE business_id = ? AND date(created_at) = date('now')`,
bid
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets
WHERE business_id = ? AND datetime(created_at) >= ? AND datetime(created_at) <= ?`,
bid, todaySql.start, todaySql.end
);
const revenue_week = scalar(
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets WHERE business_id = ? AND created_at >= datetime('now','-7 days')`,
bid
);
const revenue_month = scalar(
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets WHERE business_id = ? AND created_at >= datetime('now','-30 days')`,
bid
const revenue_range = scalar(
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets WHERE business_id = ? AND datetime(created_at) >= ?`,
bid, rangeStart
);
const revenue_prev = scalar(
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets WHERE business_id = ? AND created_at >= datetime('now','-60 days') AND created_at < datetime('now','-30 days')`,
bid
`SELECT COALESCE(SUM(amount+tip),0) v FROM tickets
WHERE business_id = ? AND datetime(created_at) >= ? AND datetime(created_at) < ?`,
bid, prevStart, rangeStart
);
const revenue_change_pct =
revenue_prev > 0 ? Math.round(((revenue_month - revenue_prev) / revenue_prev) * 1000) / 10 : 0;
revenue_prev > 0 ? Math.round(((revenue_range - revenue_prev) / revenue_prev) * 1000) / 10 : 0;
const appts_today = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND date(start_at) = date('now')`,
bid
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND start_at >= ? AND start_at <= ?`,
bid, todayIso.start, todayIso.end
);
const appts_week = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND start_at >= datetime('now','-7 days')`,
bid
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND start_at >= ?`,
bid, weekStartIso
);
const appts_upcoming = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status = 'scheduled' AND start_at >= datetime('now')`,
bid
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status = 'scheduled' AND start_at >= ?`,
bid, nowIso
);
const active_clients = scalar(
`SELECT COUNT(DISTINCT client_id) v FROM tickets WHERE business_id = ? AND created_at >= datetime('now','-30 days')`,
bid
`SELECT COUNT(DISTINCT client_id) v FROM tickets WHERE business_id = ? AND datetime(created_at) >= ?`,
bid, bizDayBoundsSqlite(tz, -30).start
);
const avg_ticket = scalar(
`SELECT COALESCE(AVG(amount+tip),0) v FROM tickets WHERE business_id = ? AND created_at >= datetime('now','-30 days')`,
bid
`SELECT COALESCE(AVG(amount+tip),0) v FROM tickets WHERE business_id = ? AND datetime(created_at) >= ?`,
bid, rangeStart
);
const total_range = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND created_at >= datetime('now','-30 days')`,
bid
// Rates over appointments scheduled (start_at) in the window.
const apptWindowTotal = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND start_at >= ?`,
bid, rangeStartIso
);
const cancels = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status IN ('cancelled','no_show') AND created_at >= datetime('now','-30 days')`,
bid
const cancelledCount = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status = 'cancelled' AND start_at >= ?`,
bid, rangeStartIso
);
const cancel_rate = total_range > 0 ? Math.round((cancels / total_range) * 1000) / 10 : 0;
const completed = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status = 'completed' AND created_at >= datetime('now','-30 days')`,
bid
const noShowCount = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status = 'no_show' AND start_at >= ?`,
bid, rangeStartIso
);
const occupancy_pct = total_range > 0 ? Math.round((completed / total_range) * 100) : 0;
const completedCount = scalar(
`SELECT COUNT(*) v FROM appointments WHERE business_id = ? AND status = 'completed' AND start_at >= ?`,
bid, rangeStartIso
);
const cancel_rate = cancelRate(cancelledCount, apptWindowTotal);
const no_show_rate = noShowRate(noShowCount, apptWindowTotal);
const completion_pct = completionRate(completedCount, apptWindowTotal);
res.json({
revenue_today: Math.round(revenue_today * 100) / 100,
revenue_week: Math.round(revenue_week * 100) / 100,
revenue_month: Math.round(revenue_month * 100) / 100,
revenue_range: Math.round(revenue_range * 100) / 100,
revenue_prev: Math.round(revenue_prev * 100) / 100,
revenue_change_pct,
appts_today,
appts_week,
@@ -76,52 +117,59 @@ dashboardRouter.get("/overview", (req: AuthedRequest, res) => {
active_clients,
avg_ticket: Math.round(avg_ticket * 100) / 100,
cancel_rate,
occupancy_pct,
no_show_rate,
completion_pct,
range,
});
});
dashboardRouter.get("/best-employees", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const ratingSince = bizDayBoundsSqlite(tz, -90).start;
const rows = db
.prepare(
`SELECT e.id, e.name, e.color, e.role,
COUNT(t.id) appts,
COALESCE(SUM(t.amount+t.tip),0) revenue,
COALESCE((SELECT AVG(rating) FROM reviews WHERE employee_id = e.id), e.rating) avg_rating
COALESCE((SELECT AVG(rating) FROM reviews WHERE employee_id = e.id AND datetime(created_at) >= ?), e.rating) avg_rating
FROM employees e
LEFT JOIN tickets t ON t.employee_id = e.id AND t.created_at >= datetime('now','-${Number(range)} days')
LEFT JOIN tickets t ON t.employee_id = e.id AND datetime(t.created_at) >= ?
WHERE e.business_id = ?
GROUP BY e.id
ORDER BY revenue DESC`
)
.all(bid) as any[];
.all(ratingSince, rangeStart, bid) as any[];
const totalAppts = rows.reduce((a, r) => a + r.appts, 0);
const out = rows.map((r) => ({
employee: { id: r.id, name: r.name, color: r.color, role: r.role },
appointments: r.appts,
revenue: Math.round(r.revenue * 100) / 100,
avg_rating: Math.round(r.avg_rating * 10) / 10,
utilization_pct: totalAppts > 0 ? Math.round((r.appts / totalAppts) * 100) : 0,
share_pct: totalAppts > 0 ? Math.round((r.appts / totalAppts) * 100) : 0,
}));
res.json({ employees: out });
});
dashboardRouter.get("/best-services", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const rows = db
.prepare(
`SELECT s.id, s.name, s.category, s.color,
COUNT(t.id) count,
COALESCE(SUM(t.amount+t.tip),0) revenue
FROM services s
LEFT JOIN tickets t ON t.service_id = s.id AND t.created_at >= datetime('now','-${Number(range)} days')
LEFT JOIN tickets t ON t.service_id = s.id AND datetime(t.created_at) >= ?
WHERE s.business_id = ?
GROUP BY s.id
ORDER BY revenue DESC`
)
.all(bid) as any[];
.all(rangeStart, bid) as any[];
const out = rows.map((r) => ({
service: { id: r.id, name: r.name, category: r.category, color: r.color },
count: r.count,
@@ -133,7 +181,9 @@ dashboardRouter.get("/best-services", (req: AuthedRequest, res) => {
dashboardRouter.get("/top-tickets", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const limit = Math.min(50, Number(req.query.limit) || 10);
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const rows = db
.prepare(
`SELECT t.*, s.name service_name, s.category service_category, s.color service_color,
@@ -143,11 +193,11 @@ dashboardRouter.get("/top-tickets", (req: AuthedRequest, res) => {
JOIN services s ON s.id = t.service_id
JOIN employees e ON e.id = t.employee_id
JOIN clients c ON c.id = t.client_id
WHERE t.business_id = ? AND t.created_at >= datetime('now','-${Number(range)} days')
WHERE t.business_id = ? AND datetime(t.created_at) >= ?
ORDER BY (t.amount + t.tip) DESC
LIMIT ?`
)
.all(bid, limit) as any[];
.all(bid, rangeStart, limit) as any[];
const out = rows.map((t) => ({
ticket: {
id: t.id,
@@ -171,7 +221,9 @@ dashboardRouter.get("/top-tickets", (req: AuthedRequest, res) => {
dashboardRouter.get("/top-clients", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const limit = Math.min(50, Number(req.query.limit) || 10);
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const rows = db
.prepare(
`SELECT c.id, c.name, c.tags, c.phone,
@@ -179,14 +231,14 @@ dashboardRouter.get("/top-clients", (req: AuthedRequest, res) => {
COALESCE(SUM(t.amount+t.tip),0) total,
MAX(t.created_at) last_visit
FROM clients c
LEFT JOIN tickets t ON t.client_id = c.id AND t.created_at >= datetime('now','-${Number(range)} days')
LEFT JOIN tickets t ON t.client_id = c.id AND datetime(t.created_at) >= ?
WHERE c.business_id = ?
GROUP BY c.id
HAVING visits > 0
ORDER BY total DESC
LIMIT ?`
)
.all(bid, limit) as any[];
.all(rangeStart, bid, limit) as any[];
const out = rows.map((r) => ({
client: { id: r.id, name: r.name, tags: r.tags, phone: r.phone },
visits: r.visits,
@@ -199,7 +251,9 @@ dashboardRouter.get("/top-clients", (req: AuthedRequest, res) => {
dashboardRouter.get("/frequent-clients", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const limit = Math.min(50, Number(req.query.limit) || 10);
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const rows = db
.prepare(
`SELECT c.id, c.name, c.tags, c.phone,
@@ -207,13 +261,13 @@ dashboardRouter.get("/frequent-clients", (req: AuthedRequest, res) => {
COALESCE(SUM(t.amount+t.tip),0) total,
MAX(t.created_at) last_visit
FROM clients c
JOIN tickets t ON t.client_id = c.id AND t.created_at >= datetime('now','-${Number(range)} days')
JOIN tickets t ON t.client_id = c.id AND datetime(t.created_at) >= ?
WHERE c.business_id = ?
GROUP BY c.id
ORDER BY visits DESC, total DESC
LIMIT ?`
)
.all(bid, limit) as any[];
.all(rangeStart, bid, limit) as any[];
const out = rows.map((r) => ({
client: { id: r.id, name: r.name, tags: r.tags, phone: r.phone },
visits: r.visits,
@@ -225,24 +279,35 @@ dashboardRouter.get("/frequent-clients", (req: AuthedRequest, res) => {
dashboardRouter.get("/revenue-trend", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const days = Math.min(120, Number(req.query.days) || 30);
const days = Math.min(120, Math.max(1, Number(req.query.days) || 30));
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -days).start;
// Pull raw tickets and bucket by BUSINESS-LOCAL date in JS (SQLite date() would use UTC,
// misattributing the evening rush to the next day).
const rows = db
.prepare(
`SELECT date(created_at) date, COALESCE(SUM(amount+tip),0) revenue, COUNT(*) appts
FROM tickets
WHERE business_id = ? AND created_at >= datetime('now','-${days} days')
GROUP BY date(created_at)
ORDER BY date ASC`
`SELECT created_at, amount, tip FROM tickets
WHERE business_id = ? AND datetime(created_at) >= ?`
)
.all(bid) as any[];
// Fill missing days with 0
const map = new Map(rows.map((r) => [r.date, r]));
.all(bid, rangeStart) as { created_at: string; amount: number; tip: number }[];
const map = new Map<string, { revenue: number; appts: number }>();
for (const r of rows) {
// Stored created_at may be "YYYY-MM-DD HH:MM:SS" (space) or "YYYY-MM-DDTHH:MM:SSZ";
// normalize to an ISO UTC instant before converting to the biz date.
const iso = typeof r.created_at === "string" && r.created_at.includes("T")
? r.created_at
: String(r.created_at).replace(" ", "T") + "Z";
const key = bizDateISO(new Date(iso), tz);
const cur = map.get(key) ?? { revenue: 0, appts: 0 };
cur.revenue += Number(r.amount) + Number(r.tip);
cur.appts += 1;
map.set(key, cur);
}
const out: { date: string; revenue: number; appts: number }[] = [];
const today = new Date();
const now = new Date();
for (let i = days - 1; i >= 0; i--) {
const d = new Date(today);
d.setDate(d.getDate() - i);
const key = d.toISOString().slice(0, 10);
const d = new Date(now.getTime() - i * 86400000);
const key = bizDateISO(d, tz);
const row = map.get(key);
out.push({
date: key,
@@ -255,17 +320,19 @@ dashboardRouter.get("/revenue-trend", (req: AuthedRequest, res) => {
dashboardRouter.get("/revenue-by-category", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const rows = db
.prepare(
`SELECT s.category, COUNT(t.id) count, COALESCE(SUM(t.amount+t.tip),0) revenue
FROM tickets t
JOIN services s ON s.id = t.service_id
WHERE t.business_id = ? AND t.created_at >= datetime('now','-${Number(range)} days')
WHERE t.business_id = ? AND datetime(t.created_at) >= ?
GROUP BY s.category
ORDER BY revenue DESC`
)
.all(bid) as any[];
.all(bid, rangeStart) as any[];
const out = rows.map((r) => ({
category: r.category,
count: r.count,
@@ -312,7 +379,9 @@ dashboardRouter.get("/tickets", (req: AuthedRequest, res) => {
dashboardRouter.get("/commissions", (req: AuthedRequest, res) => {
const bid = req.user!.business_id;
const range = (req.query.range as string) || "30";
const range = clampRange(req.query.range);
const tz = bizTz(bid);
const rangeStart = bizDayBoundsSqlite(tz, -range).start;
const rows = db
.prepare(
`SELECT e.id, e.name, e.color, e.role,
@@ -320,12 +389,12 @@ dashboardRouter.get("/commissions", (req: AuthedRequest, res) => {
COALESCE(SUM(t.amount + t.tip), 0) revenue,
COALESCE(SUM(t.commission), 0) commission
FROM employees e
LEFT JOIN tickets t ON t.employee_id = e.id AND t.created_at >= datetime('now','-${Number(range)} days')
LEFT JOIN tickets t ON t.employee_id = e.id AND datetime(t.created_at) >= ?
WHERE e.business_id = ?
GROUP BY e.id
ORDER BY commission DESC`
)
.all(bid) as any[];
.all(rangeStart, bid) as any[];
const out = rows.map((r) => ({
employee: { id: r.id, name: r.name, color: r.color, role: r.role },
sales: r.sales,