feat: move income modal to tracker page, clickable bank card

This commit is contained in:
null 2026-06-04 21:22:20 -05:00
parent 3623cadcf6
commit 81ae41325a
2 changed files with 27 additions and 22 deletions

View File

@ -21,7 +21,6 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { cn, fmt } from '@/lib/utils'; import { cn, fmt } from '@/lib/utils';
import { moveInArray, reorderPayload } from '@/lib/reorder'; import { moveInArray, reorderPayload } from '@/lib/reorder';
import IncomeBreakdownModal from '@/components/IncomeBreakdownModal';
const MONTHS = [ const MONTHS = [
'January', 'January',
@ -205,7 +204,6 @@ export default function SummaryPage() {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false); const [saving, setSaving] = useState(false);
const [error, setError] = useState(''); const [error, setError] = useState('');
const [incomeModalOpen, setIncomeModalOpen] = useState(false);
const [startingFirst, setStartingFirst] = useState('0'); const [startingFirst, setStartingFirst] = useState('0');
const [startingFifteenth, setStartingFifteenth] = useState('0'); const [startingFifteenth, setStartingFifteenth] = useState('0');
const [startingOther, setStartingOther] = useState('0'); const [startingOther, setStartingOther] = useState('0');
@ -568,10 +566,7 @@ export default function SummaryPage() {
</CardDescription> </CardDescription>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
<SummaryChart <SummaryChart rows={data.chart || []} />
rows={data.chart || []}
onStartingClick={data.bank_tracking?.enabled ? () => setIncomeModalOpen(true) : undefined}
/>
</CardContent> </CardContent>
</Card> </Card>
@ -581,15 +576,6 @@ export default function SummaryPage() {
</> </>
)} )}
{data?.bank_tracking?.enabled && (
<IncomeBreakdownModal
open={incomeModalOpen}
onClose={() => setIncomeModalOpen(false)}
year={data.year}
month={data.month}
bankTracking={data.bank_tracking}
/>
)}
</div> </div>
); );
} }

View File

@ -29,6 +29,7 @@ import { FilterChip } from '@/components/tracker/FilterChip';
import { SummaryCard, TrendCard } from '@/components/tracker/SummaryCards'; import { SummaryCard, TrendCard } from '@/components/tracker/SummaryCards';
import { PaymentLedgerDialog } from '@/components/tracker/PaymentLedgerDialog'; import { PaymentLedgerDialog } from '@/components/tracker/PaymentLedgerDialog';
import { TrackerBucket as Bucket } from '@/components/tracker/TrackerBucket'; import { TrackerBucket as Bucket } from '@/components/tracker/TrackerBucket';
import IncomeBreakdownModal from '@/components/IncomeBreakdownModal';
// Main page // Main page
@ -107,6 +108,7 @@ export default function TrackerPage() {
const [editBillData, setEditBillData] = useState(null); const [editBillData, setEditBillData] = useState(null);
// Edit Starting Amounts modal: true when open, false when closed // Edit Starting Amounts modal: true when open, false when closed
const [editStartingOpen, setEditStartingOpen] = useState(false); const [editStartingOpen, setEditStartingOpen] = useState(false);
const [incomeModalOpen, setIncomeModalOpen] = useState(false);
const [orderedRows, setOrderedRows] = useState(null); const [orderedRows, setOrderedRows] = useState(null);
const [movingBillId, setMovingBillId] = useState(null); const [movingBillId, setMovingBillId] = useState(null);
@ -515,12 +517,18 @@ export default function TrackerPage() {
) : ( ) : (
<div className="grid grid-cols-2 gap-3 lg:flex"> <div className="grid grid-cols-2 gap-3 lg:flex">
{bankTracking?.enabled ? ( {bankTracking?.enabled ? (
<div className={cn( <button
'flex-1 min-w-0 relative overflow-hidden rounded-xl border px-5 py-4 shadow-sm shadow-black/15 transition-all duration-300', type="button"
Number(bankTracking.remaining ?? 0) >= 0 onClick={() => setIncomeModalOpen(true)}
? 'border-emerald-500/30 bg-card/95' className={cn(
: 'border-destructive/30 bg-card/95', 'flex-1 min-w-0 relative overflow-hidden rounded-xl border px-5 py-4 shadow-sm shadow-black/15 transition-all duration-300 text-left',
)}> 'hover:ring-2 hover:ring-primary/30 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
Number(bankTracking.remaining ?? 0) >= 0
? 'border-emerald-500/30 bg-card/95'
: 'border-destructive/30 bg-card/95',
)}
title="Click to see income breakdown"
>
<div className="absolute top-0 left-0 right-0 h-[3px] bg-gradient-to-r from-emerald-500 to-teal-400" /> <div className="absolute top-0 left-0 right-0 h-[3px] bg-gradient-to-r from-emerald-500 to-teal-400" />
<div className="flex items-center gap-2 mb-3"> <div className="flex items-center gap-2 mb-3">
<Landmark className={cn('h-4 w-4', Number(bankTracking.remaining ?? 0) >= 0 ? 'text-emerald-500' : 'text-destructive')} /> <Landmark className={cn('h-4 w-4', Number(bankTracking.remaining ?? 0) >= 0 ? 'text-emerald-500' : 'text-destructive')} />
@ -541,7 +549,7 @@ export default function TrackerPage() {
<p className="mt-2 text-[11px] text-muted-foreground"> <p className="mt-2 text-[11px] text-muted-foreground">
{Number(bankTracking.remaining ?? 0) < 0 ? '' : ''}{fmt(Math.abs(Number(bankTracking.remaining ?? 0)))} projected after bills {Number(bankTracking.remaining ?? 0) < 0 ? '' : ''}{fmt(Math.abs(Number(bankTracking.remaining ?? 0)))} projected after bills
</p> </p>
</div> </button>
) : ( ) : (
<SummaryCard <SummaryCard
type="starting" type="starting"
@ -683,6 +691,17 @@ export default function TrackerPage() {
onSave={() => { setEditStartingOpen(false); refetch(); }} onSave={() => { setEditStartingOpen(false); refetch(); }}
/> />
{/* Income breakdown modal — opens when clicking the bank balance card */}
{bankTracking?.enabled && (
<IncomeBreakdownModal
open={incomeModalOpen}
onClose={() => setIncomeModalOpen(false)}
year={year}
month={month}
bankTracking={bankTracking}
/>
)}
{/* Late-attribution dialog — fires after sync when a payment just crossed a month boundary */} {/* Late-attribution dialog — fires after sync when a payment just crossed a month boundary */}
{lateAttributions.length > 0 && ( {lateAttributions.length > 0 && (
<LateAttributionDialog <LateAttributionDialog