Multi-phase visual facelift (design tokens, dashboards, sidebar/navbar shell, per-page help guides, and a layout/content pass across every remaining page) plus backend fixes to the dashboard KPI stats: - Admin/Supervisor dashboard KPIs (revenue, donations, registrations, tickets sold) now use a rolling trailing-month window (today back one calendar month, e.g. 9 May - 8 June if today is 8 June) instead of calendar month-to-date, which under-counted for most of the month. The comparison window shifts the same way, so like is still compared with like. - Reports deep-links from those stat tiles now match the same window (range=trailing_month, replacing range=this_month). - Design tokens (brand-* Tailwind scale + shadcn CSS variables), a site-wide contextual help button, fixed dashboard sidebar/navbar, Admin/Supervisor/Staff/User dashboard rebuilds backed by a new GET /api/stats/overview endpoint, a dedicated Contact page, Site Settings restyle with WhatsApp config folded in, and an Account activity feed backed by a new SecurityEvent model. - Every remaining page (home, events, registration flow, auth, legal, payment results, and every Admin/Supervisor/Staff/User tool page) restyled onto the same design tokens, several with real layout upgrades (home hero, events list/detail, donate page, auth pages). - 20+ new dedicated help guides so the whole site has page-specific help content instead of falling back to a generic guide. - Assorted fixes surfaced along the way: donation-leg double-counting in payment stats, donations not counting toward revenue, refund netting in per-method report breakdowns, and donation over-allocation after a refund. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
91 lines
4.0 KiB
TypeScript
91 lines
4.0 KiB
TypeScript
import { ApiImage } from "@/components/shared/ApiImage";
|
|
import { Calendar } from "lucide-react";
|
|
|
|
type Event = {
|
|
id: string;
|
|
title: string;
|
|
description?: string;
|
|
startDate: string;
|
|
endDate: string;
|
|
registrationDeadline?: string | null;
|
|
goLiveAt?: string;
|
|
price: number;
|
|
picture?: string;
|
|
isSoldOut?: boolean;
|
|
};
|
|
|
|
import { formatDateTimeRange } from "@/lib/date";
|
|
|
|
export const EventCard = ({ event }: { event: Event }) => {
|
|
const dateRange = formatDateTimeRange(event.startDate, event.endDate);
|
|
|
|
return (
|
|
<div className="border rounded-xl overflow-hidden shadow-sm hover:shadow-md hover:border-brand-200 transition">
|
|
<a href={`/events/${event.id}`} className="block">
|
|
{event.picture ? (
|
|
<ApiImage src={event.picture} alt={event.title} className="h-48 w-full object-cover" />
|
|
) : (
|
|
<div className="h-48 w-full bg-brand-50 flex items-center justify-center">
|
|
<Calendar className="w-10 h-10 text-brand-200" />
|
|
</div>
|
|
)}
|
|
<div className="p-4">
|
|
<h3 className="text-lg font-semibold hover:underline">{event.title}</h3>
|
|
<p className="text-sm text-gray-500 flex items-center gap-1.5 mt-1">
|
|
<Calendar className="w-3.5 h-3.5 shrink-0" />
|
|
{dateRange}
|
|
</p>
|
|
<p className="text-sm text-gray-600 mt-2 line-clamp-2">{event.description}</p>
|
|
</div>
|
|
</a>
|
|
<div className="px-4 pb-4">
|
|
<div className="flex gap-2">
|
|
<a
|
|
href={`/events/${event.id}`}
|
|
className="flex-1 text-center text-sm text-gray-700 border rounded-lg py-2 hover:bg-gray-50 transition-colors"
|
|
>
|
|
View details
|
|
</a>
|
|
{(() => {
|
|
const now = new Date();
|
|
const end = new Date(event.endDate);
|
|
const deadline = event.registrationDeadline ? new Date(event.registrationDeadline) : null;
|
|
const goLive = event.goLiveAt ? new Date(event.goLiveAt) : null;
|
|
const notYetOpen = goLive ? now < goLive : false;
|
|
const closed = (deadline ? now >= deadline : false) || now >= end;
|
|
if (notYetOpen) {
|
|
return (
|
|
<button disabled className="flex-1 text-center text-sm text-gray-500 bg-gray-200 rounded-lg py-2 cursor-not-allowed" title="Registration not yet open">
|
|
Opens {goLive?.toLocaleString()}
|
|
</button>
|
|
);
|
|
}
|
|
if (closed) {
|
|
return (
|
|
<button disabled className="flex-1 text-center text-sm text-gray-500 bg-gray-200 rounded-lg py-2 cursor-not-allowed" title="Registration closed">
|
|
Registration closed
|
|
</button>
|
|
);
|
|
}
|
|
if (event.isSoldOut) {
|
|
return (
|
|
<button disabled className="flex-1 text-center text-sm text-red-700 bg-red-50 border border-red-200 rounded-lg py-2 cursor-not-allowed">
|
|
Sold Out
|
|
</button>
|
|
);
|
|
}
|
|
return (
|
|
<a
|
|
href={`/register/${event.id}`}
|
|
className="flex-1 text-center text-sm text-white bg-brand-600 rounded-lg py-2 hover:bg-brand-700 transition-colors"
|
|
>
|
|
Register{event.price > 0 ? ` - R${event.price.toFixed(2)}` : ""}
|
|
</a>
|
|
);
|
|
})()}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|