Merge pull request 'Admin: stats privacy toggle, clickable event rows, fix payment method display' (#15) from dev into main

Reviewed-on: #15

backend/src/db/export.ts

@@ -1,5 +1,5 @@
 import 'dotenv/config';
-import { closeSync, existsSync, mkdirSync, openSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { spawnSync } from 'child_process';
 import Database from 'better-sqlite3';
@@ -43,32 +43,28 @@ function exportSqlite(outputPath: string): void {
 
 function exportPostgres(outputPath: string): void {
   const connString = process.env.DATABASE_URL || 'postgresql://localhost:5432/spanglish';
-  const outFd = openSync(outputPath, 'w');
-  try {
-    const result = spawnSync(
-      'pg_dump',
-      ['--clean', '--if-exists', connString],
-      {
-        stdio: ['ignore', outFd, 'pipe'],
-        encoding: 'utf-8',
-      }
-    );
-
-    if (result.error) {
-      console.error('pg_dump failed. Ensure pg_dump is installed and in PATH.');
-      console.error(result.error.message);
-      process.exit(1);
+  const result = spawnSync(
+    'pg_dump',
+    ['--clean', '--if-exists', connString],
+    {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      encoding: 'utf-8',
     }
+  );
 
-    if (result.status !== 0) {
-      console.error('pg_dump failed:', result.stderr);
-      process.exit(1);
-    }
-
-    console.log(`Exported to ${outputPath}`);
-  } finally {
-    closeSync(outFd);
+  if (result.error) {
+    console.error('pg_dump failed. Ensure pg_dump is installed and in PATH.');
+    console.error(result.error.message);
+    process.exit(1);
   }
+
+  if (result.status !== 0) {
+    console.error('pg_dump failed:', result.stderr);
+    process.exit(1);
+  }
+
+  writeFileSync(outputPath, result.stdout);
+  console.log(`Exported to ${outputPath}`);
 }
 
 async function main() {

backend/src/db/migrate.ts

@@ -368,13 +368,6 @@ async function migrate() {
       )
     `);
 
-    try {
-      await (db as any).run(sql`ALTER TABLE email_logs ADD COLUMN resend_attempts INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).run(sql`ALTER TABLE email_logs ADD COLUMN last_resent_at TEXT`);
-    } catch (e) { /* column may already exist */ }
-
     await (db as any).run(sql`
       CREATE TABLE IF NOT EXISTS email_settings (
         id TEXT PRIMARY KEY,
@@ -779,13 +772,6 @@ async function migrate() {
       )
     `);
 
-    try {
-      await (db as any).execute(sql`ALTER TABLE email_logs ADD COLUMN resend_attempts INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).execute(sql`ALTER TABLE email_logs ADD COLUMN last_resent_at TIMESTAMP`);
-    } catch (e) { /* column may already exist */ }
-
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS email_settings (
         id UUID PRIMARY KEY,

backend/src/db/schema.ts

@@ -243,8 +243,6 @@ export const sqliteEmailLogs = sqliteTable('email_logs', {
   sentAt: text('sent_at'),
   sentBy: text('sent_by').references(() => sqliteUsers.id),
   createdAt: text('created_at').notNull(),
-  resendAttempts: integer('resend_attempts').notNull().default(0),
-  lastResentAt: text('last_resent_at'),
 });
 
 export const sqliteEmailSettings = sqliteTable('email_settings', {
@@ -559,8 +557,6 @@ export const pgEmailLogs = pgTable('email_logs', {
   sentAt: timestamp('sent_at'),
   sentBy: uuid('sent_by').references(() => pgUsers.id),
   createdAt: timestamp('created_at').notNull(),
-  resendAttempts: pgInteger('resend_attempts').notNull().default(0),
-  lastResentAt: timestamp('last_resent_at'),
 });
 
 export const pgEmailSettings = pgTable('email_settings', {

backend/src/lib/email.ts

@@ -1342,61 +1342,6 @@ export const emailService = {
       error: result.error 
     };
   },
-
-  /**
-   * Resend an email from an existing log entry
-   */
-  async resendFromLog(logId: string): Promise<{ success: boolean; error?: string }> {
-    const log = await dbGet<any>(
-      (db as any).select().from(emailLogs).where(eq((emailLogs as any).id, logId))
-    );
-
-    if (!log) {
-      return { success: false, error: 'Email log not found' };
-    }
-
-    if (!log.bodyHtml || !log.subject || !log.recipientEmail) {
-      return { success: false, error: 'Email log missing required data to resend' };
-    }
-
-    const result = await sendEmail({
-      to: log.recipientEmail,
-      subject: log.subject,
-      html: log.bodyHtml,
-      text: undefined,
-    });
-
-    const now = getNow();
-    const currentResendAttempts = (log.resendAttempts ?? 0) + 1;
-
-    if (result.success) {
-      await (db as any)
-        .update(emailLogs)
-        .set({
-          status: 'sent',
-          sentAt: now,
-          errorMessage: null,
-          resendAttempts: currentResendAttempts,
-          lastResentAt: now,
-        })
-        .where(eq((emailLogs as any).id, logId));
-    } else {
-      await (db as any)
-        .update(emailLogs)
-        .set({
-          status: 'failed',
-          errorMessage: result.error,
-          resendAttempts: currentResendAttempts,
-          lastResentAt: now,
-        })
-        .where(eq((emailLogs as any).id, logId));
-    }
-
-    return {
-      success: result.success,
-      error: result.error,
-    };
-  },
 };
 
 // Export the main sendEmail function for direct use

backend/src/routes/emails.ts

@@ -349,23 +349,6 @@ emailsRouter.get('/logs/:id', requireAuth(['admin', 'organizer']), async (c) =>
   return c.json({ log });
 });
 
-// Resend email from log
-emailsRouter.post('/logs/:id/resend', requireAuth(['admin', 'organizer']), async (c) => {
-  const { id } = c.req.param();
-  
-  const result = await emailService.resendFromLog(id);
-  
-  if (!result.success && result.error === 'Email log not found') {
-    return c.json({ error: 'Email log not found' }, 404);
-  }
-  
-  if (!result.success && result.error === 'Email log missing required data to resend') {
-    return c.json({ error: result.error }, 400);
-  }
-  
-  return c.json({ success: result.success, error: result.error });
-});
-
 // Get email stats
 emailsRouter.get('/stats', requireAuth(['admin', 'organizer']), async (c) => {
   const eventId = c.req.query('eventId');

frontend/src/app/admin/emails/page.tsx

@@ -20,7 +20,6 @@ import {
   ChevronLeftIcon,
   ChevronRightIcon,
   XMarkIcon,
-  ArrowPathIcon,
 } from '@heroicons/react/24/outline';
 import toast from 'react-hot-toast';
 import clsx from 'clsx';
@@ -53,8 +52,6 @@ export default function AdminEmailsPage() {
   const [logs, setLogs] = useState<EmailLog[]>([]);
   const [logsOffset, setLogsOffset] = useState(0);
   const [logsTotal, setLogsTotal] = useState(0);
-  const [logsSubTab, setLogsSubTab] = useState<'all' | 'failed'>('all');
-  const [resendingLogId, setResendingLogId] = useState<string | null>(null);
   const [selectedLog, setSelectedLog] = useState<EmailLog | null>(null);
   
   // Stats state
@@ -217,7 +214,7 @@ export default function AdminEmailsPage() {
     if (activeTab === 'logs') {
       loadLogs();
     }
-  }, [activeTab, logsOffset, logsSubTab]);
+  }, [activeTab, logsOffset]);
 
   const loadData = async () => {
     try {
@@ -236,11 +233,7 @@ export default function AdminEmailsPage() {
 
   const loadLogs = async () => {
     try {
-      const res = await emailsApi.getLogs({
-        limit: 20,
-        offset: logsOffset,
-        ...(logsSubTab === 'failed' ? { status: 'failed' } : {}),
-      });
+      const res = await emailsApi.getLogs({ limit: 20, offset: logsOffset });
       setLogs(res.logs);
       setLogsTotal(res.pagination.total);
     } catch (error) {
@@ -248,27 +241,6 @@ export default function AdminEmailsPage() {
     }
   };
 
-  const handleResend = async (log: EmailLog) => {
-    setResendingLogId(log.id);
-    try {
-      const res = await emailsApi.resendLog(log.id);
-      if (res.success) {
-        toast.success('Email re-sent successfully');
-      } else {
-        toast.error(res.error || 'Failed to re-send email');
-      }
-      await loadLogs();
-      if (selectedLog?.id === log.id) {
-        const { log: updatedLog } = await emailsApi.getLog(log.id);
-        setSelectedLog(updatedLog);
-      }
-    } catch (error: any) {
-      toast.error(error.message || 'Failed to re-send email');
-    } finally {
-      setResendingLogId(null);
-    }
-  };
-
   const resetTemplateForm = () => {
     setTemplateForm({
       name: '',
@@ -727,35 +699,6 @@ export default function AdminEmailsPage() {
       {/* Logs Tab */}
       {activeTab === 'logs' && (
         <div>
-          {/* Sub-tabs: All | Failed */}
-          <div className="border-b border-secondary-light-gray mb-4">
-            <nav className="flex gap-4">
-              <button
-                onClick={() => { setLogsSubTab('all'); setLogsOffset(0); }}
-                className={clsx(
-                  'py-2 px-1 border-b-2 font-medium text-sm transition-colors',
-                  logsSubTab === 'all' ? 'border-primary-yellow text-primary-dark' : 'border-transparent text-gray-500 hover:text-gray-700'
-                )}
-              >
-                All
-              </button>
-              <button
-                onClick={() => { setLogsSubTab('failed'); setLogsOffset(0); }}
-                className={clsx(
-                  'py-2 px-1 border-b-2 font-medium text-sm transition-colors',
-                  logsSubTab === 'failed' ? 'border-primary-yellow text-primary-dark' : 'border-transparent text-gray-500 hover:text-gray-700'
-                )}
-              >
-                Failed
-                {stats && stats.failed > 0 && (
-                  <span className="ml-1.5 inline-flex items-center justify-center px-1.5 py-0.5 text-xs font-medium rounded-full bg-red-100 text-red-700">
-                    {stats.failed}
-                  </span>
-                )}
-              </button>
-            </nav>
-          </div>
-
           {/* Desktop: Table */}
           <Card className="overflow-hidden hidden md:block">
             <div className="overflow-x-auto">
@@ -771,17 +714,12 @@ export default function AdminEmailsPage() {
                 </thead>
                 <tbody className="divide-y divide-secondary-light-gray">
                   {logs.length === 0 ? (
-                    <tr><td colSpan={5} className="px-4 py-12 text-center text-gray-500 text-sm">{logsSubTab === 'failed' ? 'No failed emails' : 'No emails sent yet'}</td></tr>
+                    <tr><td colSpan={5} className="px-4 py-12 text-center text-gray-500 text-sm">No emails sent yet</td></tr>
                   ) : (
                     logs.map((log) => (
                       <tr key={log.id} className="hover:bg-gray-50">
                         <td className="px-4 py-3">
-                          <div className="flex flex-col gap-1">
-                            <div className="flex items-center gap-2">{getStatusIcon(log.status)}<span className="capitalize text-sm">{log.status}</span></div>
-                            {(log.resendAttempts ?? 0) > 0 && (
-                              <span className="text-xs text-gray-500">Re-sent {log.resendAttempts} time{(log.resendAttempts ?? 0) !== 1 ? 's' : ''}</span>
-                            )}
-                          </div>
+                          <div className="flex items-center gap-2">{getStatusIcon(log.status)}<span className="capitalize text-sm">{log.status}</span></div>
                         </td>
                         <td className="px-4 py-3">
                           <p className="font-medium text-sm">{log.recipientName || 'Unknown'}</p>
@@ -790,15 +728,7 @@ export default function AdminEmailsPage() {
                         <td className="px-4 py-3 max-w-xs"><p className="text-sm truncate">{log.subject}</p></td>
                         <td className="px-4 py-3 text-xs text-gray-500">{formatDate(log.sentAt || log.createdAt)}</td>
                         <td className="px-4 py-3">
-                          <div className="flex items-center justify-end gap-1">
-                            <button
-                              onClick={() => handleResend(log)}
-                              disabled={resendingLogId === log.id}
-                              className="p-2 hover:bg-gray-100 rounded-btn disabled:opacity-50"
-                              title="Re-send"
-                            >
-                              <ArrowPathIcon className={clsx('w-4 h-4', resendingLogId === log.id && 'animate-spin')} />
-                            </button>
+                          <div className="flex items-center justify-end">
                             <button onClick={() => setSelectedLog(log)} className="p-2 hover:bg-gray-100 rounded-btn" title="View">
                               <EyeIcon className="w-4 h-4" />
                             </button>
@@ -828,7 +758,7 @@ export default function AdminEmailsPage() {
           {/* Mobile: Card List */}
           <div className="md:hidden space-y-2">
             {logs.length === 0 ? (
-              <div className="text-center py-10 text-gray-500 text-sm">{logsSubTab === 'failed' ? 'No failed emails' : 'No emails sent yet'}</div>
+              <div className="text-center py-10 text-gray-500 text-sm">No emails sent yet</div>
             ) : (
               logs.map((log) => (
                 <Card key={log.id} className="p-3" onClick={() => setSelectedLog(log)}>
@@ -838,18 +768,7 @@ export default function AdminEmailsPage() {
                       <p className="font-medium text-sm truncate">{log.subject}</p>
                       <p className="text-xs text-gray-500 truncate">{log.recipientName || 'Unknown'} &lt;{log.recipientEmail}&gt;</p>
                       <p className="text-[10px] text-gray-400 mt-1">{formatDate(log.sentAt || log.createdAt)}</p>
-                      {(log.resendAttempts ?? 0) > 0 && (
-                        <p className="text-[10px] text-gray-500 mt-0.5">Re-sent {log.resendAttempts} time{(log.resendAttempts ?? 0) !== 1 ? 's' : ''}</p>
-                      )}
                     </div>
-                    <button
-                      onClick={(e) => { e.stopPropagation(); handleResend(log); }}
-                      disabled={resendingLogId === log.id}
-                      className="p-2 hover:bg-gray-100 rounded-btn flex-shrink-0 disabled:opacity-50"
-                      title="Re-send"
-                    >
-                      <ArrowPathIcon className={clsx('w-4 h-4', resendingLogId === log.id && 'animate-spin')} />
-                    </button>
                   </div>
                 </Card>
               ))
@@ -1019,26 +938,12 @@ export default function AdminEmailsPage() {
                   {selectedLog.errorMessage && (
                     <span className="text-xs text-red-500">- {selectedLog.errorMessage}</span>
                   )}
-                  {(selectedLog.resendAttempts ?? 0) > 0 && (
-                    <span className="text-xs text-gray-500">Re-sent {selectedLog.resendAttempts} time{(selectedLog.resendAttempts ?? 0) !== 1 ? 's' : ''}{selectedLog.lastResentAt ? ` (${formatDate(selectedLog.lastResentAt)})` : ''}</span>
-                  )}
                 </div>
               </div>
-              <div className="flex items-center gap-1 flex-shrink-0">
-                <button
-                  onClick={() => handleResend(selectedLog)}
-                  disabled={resendingLogId === selectedLog.id}
-                  className="p-2 hover:bg-gray-100 rounded-btn disabled:opacity-50 flex items-center gap-1.5 text-sm"
-                  title="Re-send"
-                >
-                  <ArrowPathIcon className={clsx('w-4 h-4', resendingLogId === selectedLog.id && 'animate-spin')} />
-                  Re-send
-                </button>
-                <button onClick={() => setSelectedLog(null)}
-                  className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center">
-                  <XMarkIcon className="w-5 h-5" />
-                </button>
-              </div>
+              <button onClick={() => setSelectedLog(null)}
+                className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center flex-shrink-0">
+                <XMarkIcon className="w-5 h-5" />
+              </button>
             </div>
             <div className="p-4 space-y-2 border-b border-secondary-light-gray bg-gray-50">
               <p><strong>To:</strong> {selectedLog.recipientName} &lt;{selectedLog.recipientEmail}&gt;</p>

frontend/src/lib/api.ts

@@ -492,12 +492,7 @@ export const emailsApi = {
   },
   
   getLog: (id: string) => fetchApi<{ log: EmailLog }>(`/api/emails/logs/${id}`),
-
-  resendLog: (id: string) =>
-    fetchApi<{ success: boolean; error?: string }>(`/api/emails/logs/${id}/resend`, {
-      method: 'POST',
-    }),
-
+  
   getStats: (eventId?: string) => {
     const query = eventId ? `?eventId=${eventId}` : '';
     return fetchApi<{ stats: EmailStats }>(`/api/emails/stats${query}`);
@@ -797,8 +792,6 @@ export interface EmailLog {
   sentAt?: string;
   sentBy?: string;
   createdAt: string;
-  resendAttempts?: number;
-  lastResentAt?: string;
 }
 
 export interface EmailStats {