feat(frontend): improved Dashboard.tsx, added transaction date

7project/frontend/src/api.ts

@@ -16,6 +16,7 @@ export type Transaction = {
   amount: number;
   description?: string | null;
   category_ids: number[];
+  date?: string | null; // ISO date (YYYY-MM-DD)
 };
 
 function getBaseUrl() {
@@ -84,6 +85,7 @@ export type CreateTransactionInput = {
   amount: number;
   description?: string;
   category_ids?: number[];
+  date?: string; // YYYY-MM-DD
 };
 
 export async function createTransaction(input: CreateTransactionInput): Promise<Transaction> {
@@ -99,8 +101,13 @@ export async function createTransaction(input: CreateTransactionInput): Promise<
   return res.json();
 }
 
-export async function getTransactions(): Promise<Transaction[]> {
-    const res = await fetch(`${getBaseUrl()}/transactions/`, {
+export async function getTransactions(start_date?: string, end_date?: string): Promise<Transaction[]> {
+  const params = new URLSearchParams();
+  if (start_date) params.set('start_date', start_date);
+  if (end_date) params.set('end_date', end_date);
+  const qs = params.toString();
+  const url = `${getBaseUrl()}/transactions/${qs ? `?${qs}` : ''}`;
+  const res = await fetch(url, {
     headers: getHeaders(),
   });
   if (!res.ok) throw new Error('Failed to load transactions');
@@ -153,3 +160,68 @@ export async function deleteMe(): Promise<void> {
 export function logout() {
   localStorage.removeItem('token');
 }
+
+// Categories
+export type CreateCategoryInput = { name: string; description?: string };
+export async function createCategory(input: CreateCategoryInput): Promise<Category> {
+  const res = await fetch(`${getBaseUrl()}/categories/create`, {
+    method: 'POST',
+    headers: getHeaders(),
+    body: JSON.stringify(input),
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(text || 'Failed to create category');
+  }
+  return res.json();
+}
+
+export type UpdateCategoryInput = { name?: string; description?: string };
+export async function updateCategory(category_id: number, input: UpdateCategoryInput): Promise<Category> {
+  const res = await fetch(`${getBaseUrl()}/categories/${category_id}`, {
+    method: 'PATCH',
+    headers: getHeaders(),
+    body: JSON.stringify(input),
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(text || 'Failed to update category');
+  }
+  return res.json();
+}
+
+// Transactions update
+export type UpdateTransactionInput = {
+  amount?: number;
+  description?: string;
+  date?: string;
+  category_ids?: number[];
+};
+export async function updateTransaction(id: number, input: UpdateTransactionInput): Promise<Transaction> {
+  const res = await fetch(`${getBaseUrl()}/transactions/${id}/edit`, {
+    method: 'PATCH',
+    headers: getHeaders(),
+    body: JSON.stringify(input),
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(text || 'Failed to update transaction');
+  }
+  return res.json();
+}
+
+// Balance series
+export type BalancePoint = { date: string; balance: number };
+export async function getBalanceSeries(start_date?: string, end_date?: string): Promise<BalancePoint[]> {
+  const params = new URLSearchParams();
+  if (start_date) params.set('start_date', start_date);
+  if (end_date) params.set('end_date', end_date);
+  const qs = params.toString();
+  const url = `${getBaseUrl()}/transactions/balance_series${qs ? `?${qs}` : ''}`;
+  const res = await fetch(url, { headers: getHeaders() });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(text || 'Failed to load balance series');
+  }
+  return res.json();
+}

7project/frontend/src/pages/BalanceChart.tsx

@@ -0,0 +1,46 @@
+// src/BalanceChart.tsx
+import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts';
+import { type BalancePoint } from '../api';
+
+function formatAmount(n: number) {
+  return new Intl.NumberFormat(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(n);
+}
+
+function formatDate(dateStr: string) {
+  return new Date(dateStr).toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+}
+
+export default function BalanceChart({ data }: { data: BalancePoint[] }) {
+  if (data.length === 0) {
+    return <div>No data to display</div>;
+  }
+
+  return (
+    <ResponsiveContainer width="100%" height={300}>
+      <LineChart
+        data={data}
+        // Increased 'left' margin to create more space for the Y-axis label and tick values
+        margin={{ top: 5, right: 30, left: 50, bottom: 5 }} // <-- Change this line
+      >
+        <CartesianGrid strokeDasharray="3 3" />
+        <XAxis
+          dataKey="date"
+          tickFormatter={formatDate}
+          label={{ value: 'Date', position: 'insideBottom', offset: -5 }}
+        />
+        <YAxis
+          tickFormatter={(value) => formatAmount(value as number)}
+          // Adjusted 'offset' for the Y-axis label.
+          // A negative offset moves it further away from the axis.
+          label={{ value: 'Balance', angle: -90, position: 'insideLeft', offset: -30 }} // <-- Change this line
+        />
+        <Tooltip
+          labelFormatter={formatDate}
+          formatter={(value) => [formatAmount(value as number), 'Balance']}
+        />
+        <Legend />
+        <Line type="monotone" dataKey="balance" stroke="#3b82f6" strokeWidth={2} activeDot={{ r: 8 }} />
+      </LineChart>
+    </ResponsiveContainer>
+  );
+}

7project/frontend/src/pages/CategoryPieChart.tsx

@@ -0,0 +1,100 @@
+// src/CategoryPieCharts.tsx (renamed from CategoryPieChart.tsx)
+import { useMemo } from 'react';
+import { PieChart, Pie, Cell, Tooltip, Legend, ResponsiveContainer } from 'recharts';
+import { type Transaction, type Category } from '../api';
+
+const COLORS = ['#0088FE', '#00C49F', '#FFBB28', '#FF8042', '#AF19FF', '#FF4242', '#8884d8', '#82ca9d'];
+
+// Helper component for a single pie chart
+function SinglePieChart({ data, title }: { data: { name: string; value: number }[]; title: string }) {
+  if (data.length === 0) {
+    return (
+      <div style={{ flex: 1, textAlign: 'center' }}>
+        <h4>{title}</h4>
+        <div>No data to display.</div>
+      </div>
+    );
+  }
+
+  return (
+    <div style={{ flex: 1 }}>
+      <h4>{title}</h4>
+      <ResponsiveContainer width="100%" height={300}>
+        <PieChart>
+          <Pie
+            data={data}
+            cx="50%"
+            cy="50%"
+            labelLine={false}
+            outerRadius={80}
+            fill="#8884d8"
+            dataKey="value"
+            nameKey="name"
+            label={({ name, percent }) => `${name} ${(percent * 100).toFixed(0)}%`}
+          >
+            {data.map((entry, index) => (
+              <Cell key={`cell-${index}`} fill={COLORS[index % COLORS.length]} />
+            ))}
+          </Pie>
+          <Tooltip formatter={(value) => new Intl.NumberFormat(undefined, { style: 'currency', currency: 'USD' }).format(value as number)} />
+          <Legend />
+        </PieChart>
+      </ResponsiveContainer>
+    </div>
+  );
+}
+
+
+export default function CategoryPieCharts({ transactions, categories }: { transactions: Transaction[], categories: Category[] }) {
+
+  // Calculate expenses data
+  const expensesData = useMemo(() => {
+    const spendingMap = new Map<number, number>();
+
+    transactions.forEach(tx => {
+      // Expenses are typically negative amounts in your system
+      if (tx.amount < 0 && tx.category_ids.length > 0) {
+        tx.category_ids.forEach(catId => {
+          // Use absolute value for display on chart
+          spendingMap.set(catId, (spendingMap.get(catId) || 0) + Math.abs(tx.amount));
+        });
+      }
+    });
+
+    return Array.from(spendingMap.entries())
+      .map(([categoryId, total]) => ({
+        name: categories.find(c => c.id === categoryId)?.name || `Category #${categoryId}`,
+        value: total,
+      }))
+      .sort((a, b) => b.value - a.value); // Sort descending
+  }, [transactions, categories]);
+
+  // Calculate earnings data
+  const earningsData = useMemo(() => {
+    const incomeMap = new Map<number, number>();
+
+    transactions.forEach(tx => {
+      // Earnings are typically positive amounts in your system
+      if (tx.amount > 0 && tx.category_ids.length > 0) {
+        tx.category_ids.forEach(catId => {
+          incomeMap.set(catId, (incomeMap.get(catId) || 0) + tx.amount);
+        });
+      }
+    });
+
+    return Array.from(incomeMap.entries())
+      .map(([categoryId, total]) => ({
+        name: categories.find(c => c.id === categoryId)?.name || `Category #${categoryId}`,
+        value: total,
+      }))
+      .sort((a, b) => b.value - a.value); // Sort descending
+  }, [transactions, categories]);
+
+
+  return (
+    <div style={{ display: 'flex', flexWrap: 'wrap', gap: '20px', justifyContent: 'center' }}>
+      <SinglePieChart data={expensesData} title="Expenses by Category" />
+      <SinglePieChart data={earningsData} title="Earnings by Category" />
+    </div>
+  );
+}

7project/frontend/src/pages/Dashboard.tsx

@@ -1,7 +1,9 @@
 import { useEffect, useMemo, useState } from 'react';
-import { type Category, type Transaction, createTransaction, getCategories, getTransactions } from '../api';
+import { type Category, type Transaction, type BalancePoint, createTransaction, getCategories, getTransactions, createCategory, updateTransaction, getBalanceSeries } from '../api';
 import AccountPage from './AccountPage';
 import AppearancePage from './AppearancePage';
+import BalanceChart from './BalanceChart';
+import CategoryPieChart from './CategoryPieChart';
 import { BACKEND_URL } from '../config';
 
 function formatAmount(n: number) {
@@ -47,13 +49,42 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
   const [filterCategoryId, setFilterCategoryId] = useState<number | ''>('');
   const [searchText, setSearchText] = useState('');
 
+  // Date-range filter
+  const [startDate, setStartDate] = useState<string>(''); // YYYY-MM-DD
+  const [endDate, setEndDate] = useState<string>('');
+
+  // Pagination over filtered transactions (20 per page), 0 = latest (most recent)
+  const pageSize = 20;
+  const [page, setPage] = useState<number>(0);
+
+  // Balance chart series for current date filter
+  const [balanceSeries, setBalanceSeries] = useState<BalancePoint[]>([]);
+
+  // Category creation form
+  const [newCatName, setNewCatName] = useState('');
+  const [newCatDesc, setNewCatDesc] = useState('');
+
+  // New transaction date
+  const [txDate, setTxDate] = useState<string>('');
+
+  // Inline edit state for transaction categories
+  const [editingTxId, setEditingTxId] = useState<number | null>(null);
+  const [editingCategoryIds, setEditingCategoryIds] = useState<number[]>([]);
+
   async function loadAll() {
     setLoading(true);
     setError(null);
     try {
-      const [txs, cats] = await Promise.all([getTransactions(), getCategories()]);
+      const [txs, cats, series] = await Promise.all([
+        getTransactions(startDate || undefined, endDate || undefined),
+        getCategories(),
+        getBalanceSeries(startDate || undefined, endDate || undefined),
+      ]);
       setTransactions(txs);
       setCategories(cats);
+      setBalanceSeries(series);
+      // reset paging to most recent
+      setPage(0);
     } catch (err: any) {
       setError(err?.message || 'Failed to load data');
     } finally {
@@ -61,15 +92,10 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
     }
   }
 
-  useEffect(() => { loadAll(); }, []);
-
-  const last10 = useMemo(() => {
-    const sorted = [...transactions].sort((a, b) => b.id - a.id);
-    return sorted.slice(0, 10);
-  }, [transactions]);
+  useEffect(() => { loadAll(); }, [startDate, endDate]);
 
   const filtered = useMemo(() => {
-    let arr = last10;
+    let arr = [...transactions];
     const min = minAmount !== '' ? Number(minAmount) : undefined;
     const max = maxAmount !== '' ? Number(maxAmount) : undefined;
     if (min !== undefined) arr = arr.filter(t => t.amount >= min);
@@ -77,7 +103,20 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
     if (filterCategoryId !== '') arr = arr.filter(t => t.category_ids.includes(filterCategoryId as number));
     if (searchText.trim()) arr = arr.filter(t => (t.description || '').toLowerCase().includes(searchText.toLowerCase()));
     return arr;
-  }, [last10, minAmount, maxAmount, filterCategoryId, searchText]);
+  }, [transactions, minAmount, maxAmount, filterCategoryId, searchText]);
+
+  const sortedDesc = useMemo(() => {
+    return [...filtered].sort((a, b) => {
+      const ad = (a.date || '') > (b.date || '') ? 1 : (a.date || '') < (b.date || '') ? -1 : 0;
+      if (ad !== 0) return -ad; // date desc
+      return b.id - a.id; // fallback id desc
+    });
+  }, [filtered]);
+
+  const totalPages = Math.ceil(sortedDesc.length / pageSize);
+  const pageStart = page * pageSize;
+  const pageEnd = pageStart + pageSize;
+  const visible = sortedDesc.slice(pageStart, pageEnd);
 
   function categoryNameById(id: number) { return categories.find(c => c.id === id)?.name || `#${id}`; }
 
@@ -88,16 +127,36 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
       amount: Number(amount),
       description: description || undefined,
       category_ids: selectedCategoryId !== '' ? [Number(selectedCategoryId)] : undefined,
+      date: txDate || undefined,
     };
     try {
       const created = await createTransaction(payload);
       setTransactions(prev => [created, ...prev]);
-      setAmount(''); setDescription(''); setSelectedCategoryId('');
+      setAmount(''); setDescription(''); setSelectedCategoryId(''); setTxDate('');
     } catch (err: any) {
       alert(err?.message || 'Failed to create transaction');
     }
   }
 
+  function beginEditCategories(t: Transaction) {
+    setEditingTxId(t.id);
+    setEditingCategoryIds([...(t.category_ids || [])]);
+  }
+  function cancelEditCategories() {
+    setEditingTxId(null);
+    setEditingCategoryIds([]);
+  }
+  async function saveEditCategories() {
+    if (editingTxId == null) return;
+    try {
+      const updated = await updateTransaction(editingTxId, { category_ids: editingCategoryIds });
+      setTransactions(prev => prev.map(p => (p.id === updated.id ? updated : p)));
+      cancelEditCategories();
+    } catch (err: any) {
+      alert(err?.message || 'Failed to update transaction categories');
+    }
+  }
+
   return (
     <div className="app-layout">
       <aside className="sidebar">
@@ -129,6 +188,7 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
                 <h3>Add Transaction</h3>
                 <form onSubmit={handleCreate} className="form-row">
                   <input className="input" type="number" step="0.01" placeholder="Amount" value={amount} onChange={(e) => setAmount(e.target.value)} required />
+                  <input className="input" type="date" placeholder="Date (optional)" value={txDate} onChange={(e) => setTxDate(e.target.value)} />
                   <input className="input" type="text" placeholder="Description (optional)" value={description} onChange={(e) => setDescription(e.target.value)} />
                   <select className="input" value={selectedCategoryId} onChange={(e) => setSelectedCategoryId(e.target.value ? Number(e.target.value) : '')}>
                     <option value="">No category</option>
@@ -138,9 +198,20 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
                 </form>
               </section>
 
+              <section className="card">
+                <h3>Categories</h3>
+                <form className="form-row" onSubmit={async (e) => { e.preventDefault(); if (!newCatName.trim()) return; try { const cat = await createCategory({ name: newCatName.trim(), description: newCatDesc || undefined }); setCategories(prev => [...prev, cat]); setNewCatName(''); setNewCatDesc(''); } catch (err: any) { alert(err?.message || 'Failed to create category'); } }}>
+                  <input className="input" type="text" placeholder="New category name" value={newCatName} onChange={(e) => setNewCatName(e.target.value)} />
+                  <input className="input" type="text" placeholder="Description (optional)" value={newCatDesc} onChange={(e) => setNewCatDesc(e.target.value)} />
+                  <button className="btn" type="submit">Create category</button>
+                </form>
+              </section>
+
               <section className="card">
                 <h3>Filters</h3>
-                <div className="form-row">
+                <div className="form-row" style={{ gap: 8, flexWrap: 'wrap' }}>
+                  <input className="input" type="date" placeholder="Start date" value={startDate} onChange={(e) => setStartDate(e.target.value)} />
+                  <input className="input" type="date" placeholder="End date" value={endDate} onChange={(e) => setEndDate(e.target.value)} />
                   <input className="input" type="number" step="0.01" placeholder="Min amount" value={minAmount} onChange={(e) => setMinAmount(e.target.value)} />
                   <input className="input" type="number" step="0.01" placeholder="Max amount" value={maxAmount} onChange={(e) => setMaxAmount(e.target.value)} />
                   <select className="input" value={filterCategoryId} onChange={(e) => setFilterCategoryId(e.target.value ? Number(e.target.value) : '')}>
@@ -152,7 +223,30 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
               </section>
 
               <section className="card">
-                <h3>Latest Transactions (last 10)</h3>
+                <h3>Balance over time</h3>
+                {loading ? (
+                  <div>Loading…</div>
+                ) : error ? (
+                  <div style={{ color: 'crimson' }}>{error}</div>
+                ) : (
+                  <BalanceChart data={balanceSeries} />
+                )}
+              </section>
+
+              {/* 3. Add the new section for the Category Pie Chart */}
+              <section className="card">
+                {loading ? (
+                  <div>Loading…</div>
+                ) : error ? (
+                  <div style={{ color: 'crimson' }}>{error}</div>
+                ) : (
+                  // Pass the filtered transactions to see the breakdown for the current view
+                  <CategoryPieChart transactions={filtered} categories={categories} />
+                )}
+              </section>
+
+              <section className="card">
+                <h3>Transactions</h3>
                 {loading ? (
                   <div>Loading…</div>
                 ) : error ? (
@@ -160,26 +254,57 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
                 ) : filtered.length === 0 ? (
                   <div>No transactions</div>
                 ) : (
-                  <table className="table">
-                    <thead>
-                      <tr>
-                        <th>ID</th>
-                        <th style={{ textAlign: 'right' }}>Amount</th>
-                        <th>Description</th>
-                        <th>Categories</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {filtered.map(t => (
-                        <tr key={t.id}>
-                          <td>{t.id}</td>
-                          <td className="amount">{formatAmount(t.amount)}</td>
-                          <td>{t.description || ''}</td>
-                          <td>{t.category_ids.map(id => categoryNameById(id)).join(', ')}</td>
+                  <>
+                    <div className="form-row" style={{ justifyContent: 'space-between', alignItems: 'center' }}>
+                      <div className="space-x">
+                        <button className="btn" disabled={page <= 0} onClick={() => setPage(p => Math.max(0, p - 1))}>&lt;- Load recent</button>
+                        <button className="btn" disabled={page >= totalPages - 1} onClick={() => setPage(p => Math.min(totalPages - 1, p + 1))}>Load older -&gt;</button>
+                      </div>
+                      <div className="muted">Showing {visible.length} of {filtered.length} (page {Math.min(page + 1, Math.max(1, totalPages))}/{Math.max(1, totalPages)})</div>
+                    </div>
+                    <table className="table">
+                      <thead>
+                        <tr>
+                          <th>ID</th>
+                          <th>Date</th>
+                          <th style={{ textAlign: 'right' }}>Amount</th>
+                          <th>Description</th>
+                          <th>Categories</th>
                         </tr>
-                      ))}
-                    </tbody>
-                  </table>
+                      </thead>
+                      <tbody>
+                        {visible.map(t => (
+                          <tr key={t.id}>
+                            <td>{t.id}</td>
+                            <td>{t.date || ''}</td>
+                            <td className="amount">{formatAmount(t.amount)}</td>
+                            <td>{t.description || ''}</td>
+                            <td>
+                              {editingTxId === t.id ? (
+                                <div className="space-y" style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+                                  <select multiple className="input" value={editingCategoryIds.map(String)} onChange={(e) => {
+                                    const opts = Array.from(e.currentTarget.selectedOptions).map(o => Number(o.value));
+                                    setEditingCategoryIds(opts);
+                                  }}>
+                                    {categories.map(c => (
+                                      <option key={c.id} value={c.id}>{c.name}</option>
+                                    ))}
+                                  </select>
+                                  <button className="btn" onClick={saveEditCategories}>Save</button>
+                                  <button className="btn" onClick={cancelEditCategories}>Cancel</button>
+                                </div>
+                              ) : (
+                                <div className="space-x" style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+                                  <span>{t.category_ids.map(id => categoryNameById(id)).join(', ') || '—'}</span>
+                                  <button className="btn" onClick={() => beginEditCategories(t)}>Change</button>
+                                </div>
+                              )}
+                            </td>
+                          </tr>
+                        ))}
+                      </tbody>
+                    </table>
+                  </>
                 )}
               </section>
             </>