Fix budget input and display
- Fix issue where budget input for transportation and other categories were not saved correctly. - Fix issue where total budget amount was calculated incorrectly. - Fix issue where daily and weekly budgets were not displayed correctly.
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { CirclePlus, Save, Check } from 'lucide-react';
|
||||
import BudgetInputCard from './BudgetInputCard';
|
||||
@@ -15,6 +14,7 @@ interface BudgetTabContentProps {
|
||||
calculatePercentage: (spent: number, target: number) => number;
|
||||
onSaveBudget: (amount: number, categoryBudgets?: Record<string, number>) => void;
|
||||
}
|
||||
|
||||
const BudgetTabContent: React.FC<BudgetTabContentProps> = ({
|
||||
data,
|
||||
formatCurrency,
|
||||
@@ -94,19 +94,25 @@ const BudgetTabContent: React.FC<BudgetTabContentProps> = ({
|
||||
|
||||
// 예산 여부에 따른 텍스트 결정
|
||||
const budgetButtonText = targetAmount > 0 ? "예산 수정하기" : "예산 입력하기";
|
||||
return <div>
|
||||
{targetAmount > 0 ? <>
|
||||
|
||||
return (
|
||||
<div>
|
||||
{targetAmount > 0 ? (
|
||||
<>
|
||||
<div className="flex justify-between items-center mb-3">
|
||||
<div className="text-base font-bold">{formatCurrency(spentAmount)}</div>
|
||||
<div className="text-sm text-gray-500">/ {formatCurrency(targetAmount)}</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="w-full h-2 neuro-pressed overflow-hidden mb-3">
|
||||
<div className={`h-full ${progressBarColor} transition-all duration-700 ease-out`} style={{
|
||||
width: `${Math.min(percentage, 100)}%`
|
||||
}} />
|
||||
<div
|
||||
className={`h-full ${progressBarColor} transition-all duration-700 ease-out`}
|
||||
style={{
|
||||
width: `${Math.min(percentage, 100)}%`,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="flex justify-between items-center">
|
||||
<div className={`text-sm font-medium ${isOverBudget ? 'text-red-500' : 'text-gray-500'}`}>
|
||||
{budgetStatusText}{budgetAmount}
|
||||
@@ -115,34 +121,41 @@ const BudgetTabContent: React.FC<BudgetTabContentProps> = ({
|
||||
{percentage}%
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="mt-6">
|
||||
<button onClick={toggleBudgetInput} className="text-neuro-income hover:underline flex items-center text-base font-semibold group">
|
||||
<button
|
||||
onClick={toggleBudgetInput}
|
||||
className="text-neuro-income hover:underline flex items-center text-base font-semibold group"
|
||||
>
|
||||
<CirclePlus size={26} className="mr-2 text-neuro-income transition-transform group-hover:scale-110" />
|
||||
<span className="text-base font-semibold">{budgetButtonText}</span>
|
||||
</button>
|
||||
</div>
|
||||
</> : <div className="py-4 text-center">
|
||||
</>
|
||||
) : (
|
||||
<div className="py-4 text-center">
|
||||
<div className="text-gray-400 mb-4">아직 예산이 설정되지 않았습니다</div>
|
||||
<Button onClick={toggleBudgetInput} variant="default" className="bg-neuro-income hover:bg-neuro-income/90 animate-pulse shadow-lg">
|
||||
<CirclePlus className="mr-2" size={24} />
|
||||
<span className="animate-pulse">{budgetButtonText}</span>
|
||||
</Button>
|
||||
</div>}
|
||||
|
||||
{showBudgetInput && <div className="mt-4">
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showBudgetInput && (
|
||||
<div className="mt-4">
|
||||
<div className="neuro-card p-4">
|
||||
<div>
|
||||
<h3 className="text-base font-medium mb-3">카테고리별 월간 예산 설정</h3>
|
||||
<p className="text-sm text-gray-500 mb-4">카테고리별로 월간 예산을 설정하세요. 일일, 주간 예산은 자동으로 계산됩니다.</p>
|
||||
<CategoryBudgetInputs categoryBudgets={categoryBudgets} handleCategoryInputChange={handleCategoryInputChange} />
|
||||
|
||||
|
||||
<div className="mt-4 border-t border-gray-300 pt-3">
|
||||
<div className="flex justify-between items-center mb-4">
|
||||
<h3 className="font-medium text-sm px-[34px]">월간 총 예산:</h3>
|
||||
<p className="font-bold text-neuro-income text-base px-[10px]">{formatCurrency(calculateTotalBudget())}</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="flex justify-end">
|
||||
<Button onClick={handleSaveCategoryBudgets} size="sm" className="bg-neuro-income hover:bg-neuro-income/90 text-white mx-[6px]">
|
||||
<Check size={18} className="mr-1" />
|
||||
@@ -152,7 +165,10 @@ const BudgetTabContent: React.FC<BudgetTabContentProps> = ({
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>}
|
||||
</div>;
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default BudgetTabContent;
|
||||
|
||||
Reference in New Issue
Block a user