From 9e8244bb71504f20b0a9d65347eec2954d8e9a6d Mon Sep 17 00:00:00 2001 From: joshua Date: Wed, 21 Oct 2026 10:05:51 +0200 Subject: [PATCH] Fix frontend lint: links, unused code, quotes, img elements - Internal links use next/link instead of (no full page reload). - Remove dead code: RegisterForm's unreachable Yoco checkout branch, the unused AttendeeForms on the registration success page, unused Geist fonts, and assorted unused variables and catch bindings. - Escape quotes in JSX text; replace @ts-ignore in apiFetch with a cast. - Keep the intentional raw elements (data URLs, runtime API host) with a documented lint exception; the event editor uses ApiImage. Co-Authored-By: Claude Opus 5.5 --- .../src/app/(auth)/forgot-password/page.tsx | 2 +- .../frontend/src/app/[redirectUrl]/page.tsx | 9 +- .../app/dashboard/admin/cashup/[id]/page.tsx | 6 +- .../frontend/src/app/dashboard/admin/page.tsx | 2 +- .../src/app/dashboard/admin/settings/page.tsx | 2 +- .../src/app/dashboard/admin/users/page.tsx | 9 -- .../frontend/src/app/dashboard/staff/page.tsx | 2 +- .../dashboard/staff/ticket-scanning/page.tsx | 4 +- .../supervisor/email-attendees/page.tsx | 10 +- .../supervisor/event-options/page.tsx | 6 +- .../app/dashboard/supervisor/events/page.tsx | 14 +- .../app/dashboard/supervisor/manual/page.tsx | 2 +- .../src/app/dashboard/supervisor/page.tsx | 2 +- .../dashboard/supervisor/payments/page.tsx | 14 +- .../supervisor/whatsapp-attendees/page.tsx | 2 +- .../frontend/src/app/dashboard/user/page.tsx | 12 +- .../src/app/dashboard/user/profile/page.tsx | 2 +- apps/events/frontend/src/app/layout.tsx | 11 -- apps/events/frontend/src/app/page.tsx | 13 +- .../app/register/[eventId]/RegisterForm.tsx | 43 +----- .../src/app/registration/success/page.tsx | 126 ------------------ .../frontend/src/app/self-service/page.tsx | 3 - apps/events/frontend/src/app/setup/page.tsx | 2 + .../src/components/auth/LoginForm.tsx | 6 +- .../frontend/src/components/qr/QRScanner.tsx | 2 +- .../src/components/reports/ReportsV2.tsx | 14 +- .../src/components/shared/ApiImage.tsx | 3 + .../src/components/shared/QrImage.tsx | 2 + .../src/content/help/dashboard-admin.tsx | 2 +- .../src/content/help/supervisor-forms.tsx | 2 +- .../events/frontend/src/hooks/useQRScanner.ts | 2 +- apps/events/frontend/src/lib/api.ts | 4 +- apps/events/frontend/src/middleware.ts | 4 +- 33 files changed, 73 insertions(+), 266 deletions(-) diff --git a/apps/events/frontend/src/app/(auth)/forgot-password/page.tsx b/apps/events/frontend/src/app/(auth)/forgot-password/page.tsx index c442e75..4cc938c 100644 --- a/apps/events/frontend/src/app/(auth)/forgot-password/page.tsx +++ b/apps/events/frontend/src/app/(auth)/forgot-password/page.tsx @@ -41,7 +41,7 @@ export default function ForgotPasswordPage() {

Forgot your password?

-

Enter your account email and we'll send you a link to reset your password.

+

Enter your account email and we'll send you a link to reset your password.

diff --git a/apps/events/frontend/src/app/[redirectUrl]/page.tsx b/apps/events/frontend/src/app/[redirectUrl]/page.tsx index 3c98cf2..27b7589 100644 --- a/apps/events/frontend/src/app/[redirectUrl]/page.tsx +++ b/apps/events/frontend/src/app/[redirectUrl]/page.tsx @@ -1,3 +1,4 @@ +import Link from "next/link"; import { redirect } from "next/navigation"; import { apiFetch } from "@/lib/api"; @@ -32,9 +33,9 @@ export default async function EventRedirectPage({ params }: { params: Promise<{

The page you're looking for doesn't exist.

-
+ Back to Home → - + ); } @@ -47,9 +48,9 @@ export default async function EventRedirectPage({ params }: { params: Promise<{

This event has ended

Thanks for joining us! Stay tuned for the next one.

- + Back to Home → - +
); } \ No newline at end of file diff --git a/apps/events/frontend/src/app/dashboard/admin/cashup/[id]/page.tsx b/apps/events/frontend/src/app/dashboard/admin/cashup/[id]/page.tsx index d209442..0a9dbc3 100644 --- a/apps/events/frontend/src/app/dashboard/admin/cashup/[id]/page.tsx +++ b/apps/events/frontend/src/app/dashboard/admin/cashup/[id]/page.tsx @@ -179,7 +179,7 @@ function CostsTab({ eventId, token, costs, eventOptions, isClosed, onChanged }: )}
- {isClosed &&
This event is closed — costs can't be changed until it's reopened.
} + {isClosed &&
This event is closed — costs can't be changed until it's reopened.
}
@@ -261,7 +261,7 @@ function CostsTab({ eventId, token, costs, eventOptions, isClosed, onChanged }: {METHODS.map(m => )} -

If this was paid out of the door takings (e.g. cash to a vendor), tag it so the Cashup report deducts it from that method's expected amount.

+

If this was paid out of the door takings (e.g. cash to a vendor), tag it so the Cashup report deducts it from that method's expected amount.

@@ -761,7 +761,7 @@ function ReconciliationTab({ eventId, token, data, busy, setBusy, setError, onCh
{!isClosed && ( -
Cash actual is the live sum of per-staff-member counts entered below — there's no separate event-wide entry.
+
Cash actual is the live sum of per-staff-member counts entered below — there's no separate event-wide entry.
)}
diff --git a/apps/events/frontend/src/app/dashboard/admin/page.tsx b/apps/events/frontend/src/app/dashboard/admin/page.tsx index cca9121..cfd04bb 100644 --- a/apps/events/frontend/src/app/dashboard/admin/page.tsx +++ b/apps/events/frontend/src/app/dashboard/admin/page.tsx @@ -84,7 +84,7 @@ export default function AdminDashboardPage() { ]); setPaymentStats(dash.paymentStats); setOverview(overviewData); - } catch (e) { + } catch { // ignore errors for dashboard summaries } finally { hasLoadedOnce.current = true; diff --git a/apps/events/frontend/src/app/dashboard/admin/settings/page.tsx b/apps/events/frontend/src/app/dashboard/admin/settings/page.tsx index b5241f8..f56a56d 100644 --- a/apps/events/frontend/src/app/dashboard/admin/settings/page.tsx +++ b/apps/events/frontend/src/app/dashboard/admin/settings/page.tsx @@ -875,7 +875,7 @@ function WhatsAppTab({ active }: { active: boolean }) { const res = await apiFetch("/api/whatsapp/status", { authToken: token }); setStatus(res.status ?? null); setStatusMsg(res.message ?? null); - } catch (e: any) { + } catch { await fetchConfig(); setStatus("FAILED"); setStatusMsg(null); diff --git a/apps/events/frontend/src/app/dashboard/admin/users/page.tsx b/apps/events/frontend/src/app/dashboard/admin/users/page.tsx index a5386e1..3f030ed 100644 --- a/apps/events/frontend/src/app/dashboard/admin/users/page.tsx +++ b/apps/events/frontend/src/app/dashboard/admin/users/page.tsx @@ -27,15 +27,6 @@ type Role = typeof roleOptions[number]; const notificationPreferenceOptions = ["email", "whatsapp", "both"] as const; -// Simple fuzzy: tolerate one missing/swapped char by checking if query chars appear in order -function fuzzyMatch(query: string, target: string): boolean { - const q = query.toLowerCase(); - const t = target.toLowerCase(); - if (t.includes(q)) return true; - // token-based: all tokens must appear somewhere - const tokens = q.split(/\s+/).filter(Boolean); - return tokens.every(tok => t.includes(tok)); -} export default function AdminUsersPage() { const { user, loading, token } = useAuth(); diff --git a/apps/events/frontend/src/app/dashboard/staff/page.tsx b/apps/events/frontend/src/app/dashboard/staff/page.tsx index 43e84b9..4e7ecd9 100644 --- a/apps/events/frontend/src/app/dashboard/staff/page.tsx +++ b/apps/events/frontend/src/app/dashboard/staff/page.tsx @@ -48,7 +48,7 @@ export default function StaffDashboardPage() { const data = await apiFetch("/api/stats/staff", { authToken: token }); setStats(data.scanStats); setRecentScans(Array.isArray(data.recentScans) ? data.recentScans : []); - } catch (e) { + } catch { // ignore } finally { hasLoadedOnce.current = true; diff --git a/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx b/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx index 3900298..426a537 100644 --- a/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx +++ b/apps/events/frontend/src/app/dashboard/staff/ticket-scanning/page.tsx @@ -14,7 +14,6 @@ import type { SnapshotTicket } from "@/lib/offlineScan"; export default function TicketScanningPage() { const router = useRouter(); const scannerRef = useRef(null); - const [lastResult, setLastResult] = useState(null); const [scanInfo, setScanInfo] = useDismissingState(null); const [error, setError] = useDismissingState(null); const [alreadyUsedModal, setAlreadyUsedModal] = useState<{ message: string; ticket?: any } | null>(null); @@ -64,7 +63,7 @@ export default function TicketScanningPage() { const evs = await apiFetch("/api/events/all?includePast=true", { authToken: token }); const sorted = (evs || []).sort((a, b) => new Date(a.endDate).getTime() - new Date(b.endDate).getTime()); setAllEvents(sorted); - } catch (e: any) { + } catch { // non-fatal } finally { setLoadingEvents(false); @@ -120,7 +119,6 @@ export default function TicketScanningPage() { }, [selectedEventId, selectedSectionId]); async function handleResult(text: string) { - setLastResult(text); setError(null); setScanInfo(null); try { diff --git a/apps/events/frontend/src/app/dashboard/supervisor/email-attendees/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/email-attendees/page.tsx index 90b3c30..0fa356c 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/email-attendees/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/email-attendees/page.tsx @@ -180,8 +180,6 @@ function EmailAttendeesPageInner() { // Tabs: attendees (current), automations (coming soon), broadcasts const [tab, setTab] = useState<'attendees'|'automations'|'broadcasts'|'scheduled'>('attendees'); - const isAdmin = user?.role === "admin"; - const [allEvents, setAllEvents] = useState([]); const [evIncludePast, setEvIncludePast] = useState(false); @@ -221,7 +219,7 @@ function EmailAttendeesPageInner() { .map((u: any) => ({ id: u.id, name: u.name || '', email: u.email || '', pref: u.notificationPreference || 'email' })) .sort((a: any, b: any) => (a.name || '').localeCompare(b.name || '', undefined, { sensitivity: 'base' })); setUsers(mapped); - } catch (e) { + } catch { // ignore for now } finally { setLoadingUsers(false); @@ -277,7 +275,7 @@ function EmailAttendeesPageInner() { setLoadingScheduled(true); const res = await apiFetch<{jobs: ScheduledJob[]}>(`/api/scheduled-emails?channel=email`, { authToken: token }); setScheduled(Array.isArray(res?.jobs) ? res.jobs : []); - } catch (e) { + } catch { // ignore here; surfaces via UI when tab open } finally { setLoadingScheduled(false); @@ -402,7 +400,7 @@ function EmailAttendeesPageInner() { // Default: select those with email/both preference; fall back to all const matching = list.filter(a => a.pref === 'email' || a.pref === 'both').map(a => a.id); setSelectedAttendeeIds(matching.length > 0 ? matching : list.map(a => a.id)); - } catch (e) { + } catch { // ignore } finally { setLoadingAttendees(false); @@ -584,7 +582,7 @@ function EmailAttendeesPageInner() {
  • {'{{event.title}}'} — the event title.
  • {'{{event.start}}'} — the event start date/time (local).
  • {'{{balance}}'} — outstanding amount across the attendee’s registrations for the selected event.
  • -
  • {'{{payment.link}}'} — a direct Yoco payment link for the attendee's outstanding balance (generated per recipient when sending).
  • +
  • {'{{payment.link}}'} — a direct Yoco payment link for the attendee's outstanding balance (generated per recipient when sending).
  • Example: Hi {'{{name}}'}, your balance is {'{{balance}}'}. Pay here: {'{{payment.link}}'}

    To add new placeholders, extend backend/src/utils/placeholders.js and update this help.

    diff --git a/apps/events/frontend/src/app/dashboard/supervisor/event-options/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/event-options/page.tsx index 635af2b..8fcc348 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/event-options/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/event-options/page.tsx @@ -113,20 +113,16 @@ function EventOptionsContent() { const [events, setEvents] = useState([]); const [selectedEventId, setSelectedEventId] = useState(""); const [options, setOptions] = useState([]); - const [loadingEv, setLoadingEv] = useState(false); const [error, setError] = useDismissingState(null); const [info, setInfo] = useDismissingState(null); const loadEvents = async () => { if (!token) return; try { - setLoadingEv(true); const evs = await apiFetch("/api/events/all", { authToken: token }); setEvents(evs || []); - } catch (e) { + } catch { // ignore - } finally { - setLoadingEv(false); } }; diff --git a/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx index 41518e4..2b06168 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/events/page.tsx @@ -4,7 +4,8 @@ import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from "re import { createPortal } from "react-dom"; import { useAuth } from "@/hooks/useAuth"; import { useRouter } from "next/navigation"; -import { apiFetch, resolveToApiOrigin } from "@/lib/api"; +import { apiFetch } from "@/lib/api"; +import { ApiImage } from "@/components/shared/ApiImage"; import { useDismissingState } from "@/hooks/useDismissingState"; import { useSiteSettings } from "@/contexts/SiteSettingsContext"; import { Calendar } from "lucide-react"; @@ -819,8 +820,7 @@ interface EventModalProps { } function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) { - const { token, user } = useAuth(); - const isAdmin = user?.role === "admin"; + const { token } = useAuth(); const { settings } = useSiteSettings(); const [step, setStep] = useState(0); const [pricingSubstep, setPricingSubstep] = useState(0); @@ -1306,7 +1306,7 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
    {isClosed && (
    - This event is closed — it can't be edited until it's reopened from the cashup page (admin only). + This event is closed — it can't be edited until it's reopened from the cashup page (admin only).
    )} {error &&
    {error}
    } @@ -1342,7 +1342,7 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) { onChange={e => upd({ requiresRegistration: !e.target.checked, price: e.target.checked ? "0" : draft.price })} />
    {draft.requiresRegistration ? ( @@ -1369,7 +1369,7 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) { )}
    - {draft.picture && } +
    upd({ picture: e.target.value })} /> upd({ picture: url })} label="Upload" /> @@ -1405,7 +1405,7 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) { {/* ── Step 2: Sections ── */} {step === 2 && (
    -

    Group ticket options into named sections shown on the registration page (e.g. "Tickets", "Add-ons", "Accommodation").

    +

    Group ticket options into named sections shown on the registration page (e.g. "Tickets", "Add-ons", "Accommodation").

    {mode === "edit" && ev?.id ? : diff --git a/apps/events/frontend/src/app/dashboard/supervisor/manual/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/manual/page.tsx index 9b317a1..d8d811a 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/manual/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/manual/page.tsx @@ -261,7 +261,7 @@ export default function ManualRegistrationPage() { }); active.sort((a, b) => new Date(a.startDate).getTime() - new Date(b.startDate).getTime()); setEvents(active); - } catch (e: any) { + } catch { // ignore } })(); diff --git a/apps/events/frontend/src/app/dashboard/supervisor/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/page.tsx index efce0b0..33edca4 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/page.tsx @@ -86,7 +86,7 @@ export default function SupervisorDashboardPage() { setPaymentStats(data.paymentStats); setRecentScans(Array.isArray(data.recentScans) ? data.recentScans : []); setOverview(overviewData); - } catch (e) { + } catch { // ignore } finally { hasLoadedOnce.current = true; diff --git a/apps/events/frontend/src/app/dashboard/supervisor/payments/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/payments/page.tsx index 7c064ab..3c15d66 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/payments/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/payments/page.tsx @@ -209,7 +209,7 @@ function PaymentsContent() { // Sort by createdAt desc const sorted = list.sort((a,b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); setRegistrations(sorted); - } catch (e) { + } catch { // ignore } finally { setLoadingRegs(false); @@ -226,7 +226,7 @@ function PaymentsContent() { setLoadingUsers(true); const users = await fetchAllUsers(token); setAllUsers(users); - } catch (e) { + } catch { // ignore; fallback to derived users from registrations } finally { setLoadingUsers(false); @@ -417,7 +417,7 @@ function PaymentsContent() { } try { setSubmitting(true); - const res = await apiFetch("/api/payments", { + await apiFetch("/api/payments", { method: "POST", authToken: token, body: { @@ -462,7 +462,7 @@ function PaymentsContent() { const res = await apiFetch("/api/yoco-transactions/unreconciled", { authToken: token }); const items = Array.isArray(res?.data) ? res.data : (Array.isArray(res) ? res : []); setYocoTxs(items); - } catch (e) { + } catch { // ignore silently, shown on demand via error state if needed } finally { setYocoLoading(false); @@ -753,7 +753,6 @@ function PaymentsContent() { registrations.filter((r:any)=> String(r.user?.id||r.userId)===String(uid))} regOutstanding={regOutstanding} onDone={async()=>{ await Promise.all([loadPayments(), loadRegistrations()]); setInfo('Refund recorded'); }} @@ -877,13 +876,12 @@ function PaymentsContent() { type RefundSectionProps = { payments: any[]; allUsers: any[]; - usersList: { id: string; name: string }[]; regsForUser: (userId: string) => any[]; regOutstanding: Record; onDone: () => void | Promise; }; -function RefundSection({ payments, allUsers, usersList, regsForUser, regOutstanding, onDone }: RefundSectionProps) { +function RefundSection({ payments, allUsers, regsForUser, regOutstanding, onDone }: RefundSectionProps) { const { token } = useAuth(); const [userId, setUserId] = useState(""); const [target, setTarget] = useState<'payment'|'registration'>('payment'); @@ -1003,7 +1001,7 @@ function RefundSection({ payments, allUsers, usersList, regsForUser, regOutstand -
    Mirrors the method being refunded — this is what nets against that method's total in reports.
    +
    Mirrors the method being refunded — this is what nets against that method's total in reports.
    diff --git a/apps/events/frontend/src/app/dashboard/supervisor/whatsapp-attendees/page.tsx b/apps/events/frontend/src/app/dashboard/supervisor/whatsapp-attendees/page.tsx index b9529f3..ca8b535 100644 --- a/apps/events/frontend/src/app/dashboard/supervisor/whatsapp-attendees/page.tsx +++ b/apps/events/frontend/src/app/dashboard/supervisor/whatsapp-attendees/page.tsx @@ -693,7 +693,7 @@ function WhatsAppAttendeesPageInner() {
  • {"{{event.title}}"} — the event title.
  • {"{{event.start}}"} — the event start date/time.
  • {"{{balance}}"} — outstanding balance for the event.
  • -
  • {"{{payment.link}}"} — a direct Yoco payment link for the attendee's outstanding balance (generated per recipient when sending).
  • +
  • {"{{payment.link}}"} — a direct Yoco payment link for the attendee's outstanding balance (generated per recipient when sending).
  • Preference indicators: WA = WhatsApp only,{" "} diff --git a/apps/events/frontend/src/app/dashboard/user/page.tsx b/apps/events/frontend/src/app/dashboard/user/page.tsx index 4360772..ac8fc07 100644 --- a/apps/events/frontend/src/app/dashboard/user/page.tsx +++ b/apps/events/frontend/src/app/dashboard/user/page.tsx @@ -218,7 +218,7 @@ export default function UserDashboardPage() { requiredCount, complete, }; - } catch (e) { + } catch { // On any error, do not show forms status to avoid noisy UI next[r.id] = { hasForm: false }; } @@ -456,16 +456,6 @@ export default function UserDashboardPage() { return Array.from(map.values()).sort((a, b) => new Date(a.startDate).getTime() - new Date(b.startDate).getTime()); }, [registrations]); - // Tickets by grouping - const ticketsByEvent = useMemo(() => { - const m: Record = {}; - for (const t of tickets) { - const eid = t.eventId; - if (!m[eid]) m[eid] = []; - m[eid].push(t); - } - return m; - }, [tickets]); // Registration click -> open modal const activeReg = useMemo(() => registrations.find(r => r.id === activeRegId) || null, [registrations, activeRegId]); diff --git a/apps/events/frontend/src/app/dashboard/user/profile/page.tsx b/apps/events/frontend/src/app/dashboard/user/profile/page.tsx index ccfb541..fc10a66 100644 --- a/apps/events/frontend/src/app/dashboard/user/profile/page.tsx +++ b/apps/events/frontend/src/app/dashboard/user/profile/page.tsx @@ -148,7 +148,7 @@ export default function UserProfilePage() { try { const res = await apiFetch("/api/users/activity", { authToken: token }); setActivity(Array.isArray(res) ? res : []); - } catch (e) { + } catch { // Non-critical — just leave the list empty rather than showing an error banner. } finally { setLoadingActivity(false); diff --git a/apps/events/frontend/src/app/layout.tsx b/apps/events/frontend/src/app/layout.tsx index f05756b..0004bf3 100644 --- a/apps/events/frontend/src/app/layout.tsx +++ b/apps/events/frontend/src/app/layout.tsx @@ -1,5 +1,4 @@ import type { Metadata } from "next"; -import { Geist, Geist_Mono } from "next/font/google"; import "./globals.css"; import { AuthProvider } from "@/contexts/AuthContext"; import { SiteSettingsProvider } from "@/contexts/SiteSettingsContext"; @@ -14,16 +13,6 @@ import { API_BASE, resolveToApiOrigin } from "@/lib/api"; import { buildThemeCssVars } from "@/lib/colorScale"; import { appUrl } from "@/lib/siteConfig"; -const geistSans = Geist({ - variable: "--font-geist-sans", - subsets: ["latin"], -}); - -const geistMono = Geist_Mono({ - variable: "--font-geist-mono", - subsets: ["latin"], -}); - const appName = process.env.NEXT_PUBLIC_APP_NAME || 'Cross Code'; /** diff --git a/apps/events/frontend/src/app/page.tsx b/apps/events/frontend/src/app/page.tsx index 605005c..caca5a3 100644 --- a/apps/events/frontend/src/app/page.tsx +++ b/apps/events/frontend/src/app/page.tsx @@ -1,3 +1,4 @@ +import Link from "next/link"; import { EventCard } from "@/components/events/EventCard"; import { Navbar } from "@/components/layout/Navbar"; import { Footer } from "@/components/layout/Footer"; @@ -71,10 +72,10 @@ export default async function HomePage() {

    Welcome to {displayName}

    Experience unforgettable moments. Powered by purpose.

    @@ -83,10 +84,10 @@ export default async function HomePage() {

    Upcoming Events

    - + View all events - +
    {sorted.length === 0 ? (
    @@ -101,10 +102,10 @@ export default async function HomePage() {
    )}
    diff --git a/apps/events/frontend/src/app/register/[eventId]/RegisterForm.tsx b/apps/events/frontend/src/app/register/[eventId]/RegisterForm.tsx index 3fd6a1f..d09ec2f 100644 --- a/apps/events/frontend/src/app/register/[eventId]/RegisterForm.tsx +++ b/apps/events/frontend/src/app/register/[eventId]/RegisterForm.tsx @@ -300,8 +300,6 @@ export default function RegisterForm({ event: baseEvent }: { event: Event }) { return initial; }); const [error, setError] = useState(null); - const [registrationId, setRegistrationId] = useState(null); - const [creatingCheckout, setCreatingCheckout] = useState(false); const [creatingRegistration, setCreatingRegistration] = useState(false); const [coupon, setCoupon] = useState(null); const [namingOthers, setNamingOthers] = useState(false); @@ -484,27 +482,6 @@ export default function RegisterForm({ event: baseEvent }: { event: Event }) { } }; - const createYocoCheckout = async () => { - if (!token || !registrationId) return; - try { - setCreatingCheckout(true); - const res = await apiFetch<{ redirectUrl: string }>("/api/payments/yoco-checkout", { - method: "POST", - body: { - registrationId, - successUrl: window.location.origin + "/payment/success", - cancelUrl: window.location.origin + "/payment/cancel", - failureUrl: window.location.origin + "/payment/failure", - }, - authToken: token, - }); - window.open(res.redirectUrl, "_blank"); - } catch (e: any) { - setError(e?.message || "Failed to create checkout"); - } finally { - setCreatingCheckout(false); - } - }; return ( <> @@ -628,12 +605,11 @@ export default function RegisterForm({ event: baseEvent }: { event: Event }) { )}
    Total: R{payable.toFixed(2)}
    - {!registrationId ? ( - eventSoldOut ? ( - - ) : ( + {eventSoldOut ? ( + + ) : ( - ) - ) : ( - )} diff --git a/apps/events/frontend/src/app/registration/success/page.tsx b/apps/events/frontend/src/app/registration/success/page.tsx index ffb8255..b055416 100644 --- a/apps/events/frontend/src/app/registration/success/page.tsx +++ b/apps/events/frontend/src/app/registration/success/page.tsx @@ -1,5 +1,4 @@ "use client"; -import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras"; import React, { Suspense } from "react"; import { Navbar } from "@/components/layout/Navbar"; import { Footer } from "@/components/layout/Footer"; @@ -22,35 +21,23 @@ function RegistrationSuccessContent() { const [reg, setReg] = React.useState(null); const [form, setForm] = React.useState<{ isRequired: boolean; fields: FormField[] } | null>(null); - const [formsData, setFormsData] = React.useState>>({}); - const [loading, setLoading] = React.useState(false); const [error, setError] = React.useState(null); - const [info, setInfo] = React.useState(null); const [payLoading, setPayLoading] = React.useState(false); React.useEffect(() => { (async () => { setError(null); - setInfo(null); if (!registrationId) return; try { - setLoading(true); // Try to fetch registration and event form const r = token ? await (await import('@/lib/api')).apiFetch(`/api/registrations/${encodeURIComponent(registrationId)}`, { authToken: token }) : null; if (r) { setReg(r); const ev = await (await import('@/lib/api')).apiFetch(`/api/events/${encodeURIComponent(r.eventId)}`); if (ev?.form) setForm(ev.form); - // Load any saved draft - try { - const d = await (await import('@/lib/api')).apiFetch(`/api/registrations/${encodeURIComponent(registrationId)}/forms/draft`, { authToken: token || undefined }); - if (d && d.data && typeof d.data === 'object') setFormsData(d.data); - } catch {} } } catch (e: any) { setError(e?.message || 'Failed to load details'); - } finally { - setLoading(false); } })(); }, [registrationId, token]); @@ -161,119 +148,6 @@ function RegistrationSuccessContent() { ); } -function AttendeeForms({ reg, form, formsData, setFormsData, setError, setInfo }: { reg: any; form: { isRequired: boolean; fields: FormField[] }; formsData: Record>; setFormsData: any; setError: any; setInfo: any; }) { - const { token } = useAuth(); - const registrationId = reg?.id; - const mainTickets = (reg?.registrationOptions || []).filter((o: any) => o?.eventOption?.isMainTicket).reduce((s: number, o: any) => s + (o.quantity || 0), 0); - const count = Math.max(0, mainTickets); - - const canSubmit = React.useMemo(() => { - if (!form || count <= 0) return false; - const reqFields = (form.fields || []) - .filter(f => !!f.isRequired && f.type !== 'statement' && f.type !== 'paragraph') - .map(f => f.id); - for (let i = 0; i < count; i++) { - const data = formsData[i] || {}; - for (const fid of reqFields) { - const v = data[fid]; - if (v === undefined || v === null || String(v).trim() === '') { - return false; - } - } - } - return true; - }, [form, formsData, count]); - - const update = (idx: number, fieldId: string, value: string) => { - setFormsData((prev: any) => ({ ...prev, [idx]: { ...(prev[idx]||{}), [fieldId]: value } })); - }; - - const submit = async () => { - try { - setError(null); setInfo(null); - if (!token) { setError('Please login to submit forms.'); return; } - const payload = [] as any[]; - for (let i = 0; i < count; i++) { - payload.push({ answers: formsData[i] || {} }); - } - await (await import('@/lib/api')).apiFetch(`/api/registrations/${encodeURIComponent(registrationId)}/forms/responses`, { - method: 'POST', - authToken: token, - body: { responses: payload } - }); - setInfo('Attendee forms submitted. You will receive tickets once payment is confirmed.'); - } catch (e: any) { - setError(e?.message || 'Failed to submit forms'); - } - }; - - const saveDraft = async () => { - try { - setError(null); setInfo(null); - if (!token) { setError('Please login to save drafts.'); return; } - await (await import('@/lib/api')).apiFetch(`/api/registrations/${encodeURIComponent(registrationId)}/forms/draft`, { - method: 'PUT', - authToken: token, - body: { data: formsData } - }); - setInfo('Draft saved. You can finish later from your dashboard.'); - } catch (e: any) { - setError(e?.message || 'Failed to save draft'); - } - }; - - if (!form || !Array.isArray(form.fields) || count === 0) return null; - - return ( -
    -
    Attendee details
    -
    - {Array.from({ length: count }, (_, idx) => ( -
    -
    Attendee {idx + 1}
    - {form.fields.map((f) => ( -
    - {f.type === 'statement' ? ( -
    {f.label}
    - ) : f.type === 'paragraph' ? ( -
    - {f.label &&
    {f.label}
    } - {f.helpText &&
    {f.helpText}
    } -
    - ) : ( - <> - - {isExtraFieldType(f.type) ? ( - update(idx, f.id, v)} /> - ) : f.type === 'yes_no' ? ( - - ) : f.type === 'date' ? ( - update(idx, f.id, e.target.value)} /> - ) : f.type === 'numeric' ? ( - update(idx, f.id, e.target.value)} /> - ) : ( - update(idx, f.id, e.target.value)} /> - )} - {f.helpText &&
    {f.helpText}
    } - - )} -
    - ))} -
    - ))} -
    -
    - - -
    -
    - ); -} - export default function RegistrationSuccessPage() { return ( Loading...}> diff --git a/apps/events/frontend/src/app/self-service/page.tsx b/apps/events/frontend/src/app/self-service/page.tsx index 7dcbe9a..1757afa 100644 --- a/apps/events/frontend/src/app/self-service/page.tsx +++ b/apps/events/frontend/src/app/self-service/page.tsx @@ -187,7 +187,6 @@ export default function SelfServicePage() { // ── Event form (attendee form) state ──────────────────────────── const [currentRegistrationId, setCurrentRegistrationId] = useState(null); - const [currentUserId, setCurrentUserId] = useState(null); const [currentTicketIndex, setCurrentTicketIndex] = useState(0); const [allFormAnswers, setAllFormAnswers] = useState[]>([]); const [currentTicketAnswers, setCurrentTicketAnswers] = useState>({}); @@ -442,7 +441,6 @@ export default function SelfServicePage() { }); setCurrentRegistrationId(result?.id || null); - setCurrentUserId(result?.userId || null); setRegistrationIsFree(result?.status === "paid" || (result?.totalDueComputed ?? total) === 0); setConfirmationName(visitorName.trim()); @@ -562,7 +560,6 @@ export default function SelfServicePage() { setLookupMessage(null); setFormError(null); setCurrentRegistrationId(null); - setCurrentUserId(null); setCurrentTicketIndex(0); setAllFormAnswers([]); setCurrentTicketAnswers({}); diff --git a/apps/events/frontend/src/app/setup/page.tsx b/apps/events/frontend/src/app/setup/page.tsx index a161611..21d5d78 100644 --- a/apps/events/frontend/src/app/setup/page.tsx +++ b/apps/events/frontend/src/app/setup/page.tsx @@ -386,6 +386,8 @@ export default function SetupPage() { {logoPreview && ( + // Local file preview (data: URL) — nothing for next/image to optimize. + // eslint-disable-next-line @next/next/no-img-element Preview )} {suggestedColors.length > 0 && ( diff --git a/apps/events/frontend/src/components/auth/LoginForm.tsx b/apps/events/frontend/src/components/auth/LoginForm.tsx index ea23d6c..79bdaf5 100644 --- a/apps/events/frontend/src/components/auth/LoginForm.tsx +++ b/apps/events/frontend/src/components/auth/LoginForm.tsx @@ -225,19 +225,19 @@ export function LoginForm() { diff --git a/apps/events/frontend/src/components/qr/QRScanner.tsx b/apps/events/frontend/src/components/qr/QRScanner.tsx index cffe68c..affd45a 100644 --- a/apps/events/frontend/src/components/qr/QRScanner.tsx +++ b/apps/events/frontend/src/components/qr/QRScanner.tsx @@ -190,7 +190,7 @@ export const QRScanner = React.forwardRef( /> ) : (
    - Camera is off. Tap "Scan Ticket" to start using the back camera. + Camera is off. Tap "Scan Ticket" to start using the back camera.
    )} diff --git a/apps/events/frontend/src/components/reports/ReportsV2.tsx b/apps/events/frontend/src/components/reports/ReportsV2.tsx index b34b66c..6dfaf9d 100644 --- a/apps/events/frontend/src/components/reports/ReportsV2.tsx +++ b/apps/events/frontend/src/components/reports/ReportsV2.tsx @@ -243,7 +243,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) { try { const list = await apiFetch(`/api/payments/event/${encodeURIComponent(id)}`, { authToken: token }); byEv[id] = Array.isArray(list) ? list : []; - } catch (e) { + } catch { byEv[id] = []; } } @@ -257,7 +257,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) { try { const list = await apiFetch(`/api/registrations/event/${encodeURIComponent(id)}`, { authToken: token }); byEv[id] = Array.isArray(list) ? list : []; - } catch (e) { + } catch { byEv[id] = []; } } @@ -271,7 +271,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) { try { const tickets = await apiFetch(`/api/tickets/event/${encodeURIComponent(id)}`, { authToken: token }); result[id] = { used: tickets.filter(t => t.isUsed).length, unused: tickets.filter(t => !t.isUsed).length }; - } catch (e) { + } catch { result[id] = { used: 0, unused: 0 }; } } @@ -284,7 +284,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) { for (const id of eventIds) { try { byEv[id] = await apiFetch(`/api/cashups/event/${encodeURIComponent(id)}`, { authToken: token }); - } catch (e) { + } catch { byEv[id] = null; } } @@ -320,7 +320,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) { if (dateTo) query.set("to", dateTo); try { return await apiFetch(`/api/coupons/redemptions?${query.toString()}`, { authToken: token }); - } catch (e) { + } catch { return []; } }; @@ -350,7 +350,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) { const idSet = new Set(eventIds); const filtered = eventIds.length > 1 ? (rows || []).filter(r => idSet.has(r.eventId)) : (rows || []); return computeAuditDeltas(filtered).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); - } catch (e) { + } catch { return []; } }; @@ -2192,7 +2192,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
    - Every donation logged for these events, who gave it, and how much of it has been applied to an order (Used) versus still available (Unused). This is independent of the orders table above — a donation isn't tied to the donor's own order. + Every donation logged for these events, who gave it, and how much of it has been applied to an order (Used) versus still available (Unused). This is independent of the orders table above — a donation isn't tied to the donor's own order.
    {donationsMadeRows.length === 0 ? (
    No donations logged for these events.
    diff --git a/apps/events/frontend/src/components/shared/ApiImage.tsx b/apps/events/frontend/src/components/shared/ApiImage.tsx index 0c95579..b1a27d6 100644 --- a/apps/events/frontend/src/components/shared/ApiImage.tsx +++ b/apps/events/frontend/src/components/shared/ApiImage.tsx @@ -34,5 +34,8 @@ export function ApiImage({ src, alt = "", className, style }: Props) { // and then jump once resolved — same class of flash as an unauthenticated nav link showing too early. if (!resolved) return