충돌 해결: 앱 아이콘 배경색 업데이트

This commit is contained in:
hansoo
2025-03-16 21:23:25 +09:00
12 changed files with 60 additions and 52 deletions

View File

@@ -1,29 +1,27 @@
import React, { useState } from 'react';
import { Transaction } from './TransactionCard';
import TransactionEditDialog from './TransactionEditDialog';
import { ChevronRight } from 'lucide-react';
import { useBudget } from '@/contexts/BudgetContext';
import { Link } from 'react-router-dom';
interface RecentTransactionsSectionProps {
transactions: Transaction[];
onUpdateTransaction?: (transaction: Transaction) => void;
}
const RecentTransactionsSection: React.FC<RecentTransactionsSectionProps> = ({
const RecentTransactionsSection: React.FC<RecentTransactionsSectionProps> = ({
transactions,
onUpdateTransaction
onUpdateTransaction
}) => {
const [selectedTransaction, setSelectedTransaction] = useState<Transaction | null>(null);
const [isDialogOpen, setIsDialogOpen] = useState(false);
const { updateTransaction, deleteTransaction } = useBudget();
const {
updateTransaction,
deleteTransaction
} = useBudget();
const handleTransactionClick = (transaction: Transaction) => {
setSelectedTransaction(transaction);
setIsDialogOpen(true);
};
const handleUpdateTransaction = (updatedTransaction: Transaction) => {
if (onUpdateTransaction) {
onUpdateTransaction(updatedTransaction);
@@ -31,16 +29,13 @@ const RecentTransactionsSection: React.FC<RecentTransactionsSectionProps> = ({
// 직접 컨텍스트를 통해 업데이트
updateTransaction(updatedTransaction);
};
const handleDeleteTransaction = (id: string) => {
// 직접 컨텍스트를 통해 삭제
deleteTransaction(id);
};
const formatCurrency = (amount: number) => {
return amount.toLocaleString('ko-KR') + '원';
};
const getCategoryIcon = (category: string) => {
switch (category) {
case '식비':
@@ -61,9 +56,7 @@ const RecentTransactionsSection: React.FC<RecentTransactionsSectionProps> = ({
return '💰';
}
};
return (
<div className="mt-6">
return <div className="mt-6 mb-[50px]">
<div className="flex justify-between items-center mb-3">
<h2 className="text-lg font-semibold"> </h2>
<Link to="/transactions" className="text-sm text-neuro-income flex items-center">
@@ -71,44 +64,24 @@ const RecentTransactionsSection: React.FC<RecentTransactionsSectionProps> = ({
</Link>
</div>
<div className="neuro-card divide-y divide-gray-100 w-full">
{transactions.length > 0 ? (
transactions.map((transaction) => (
<div
key={transaction.id}
className="flex justify-between py-3 px-4 cursor-pointer hover:bg-gray-50"
onClick={() => handleTransactionClick(transaction)}
>
{transactions.length > 0 ? transactions.map(transaction => <div key={transaction.id} onClick={() => handleTransactionClick(transaction)} className="flex justify-between py-3 px-4 cursor-pointer hover:bg-gray-50">
<div className="flex items-center">
<span className="text-xl mr-3">{getCategoryIcon(transaction.category)}</span>
<div>
<h3 className="font-medium">{transaction.title}</h3>
<h3 className="font-medium text-black">{transaction.title}</h3>
<p className="text-xs text-gray-500">{transaction.date}</p>
</div>
</div>
<div className="text-right">
<p className="font-semibold text-red-500">-{formatCurrency(transaction.amount)}</p>
<p className="font-semibold text-neuro-income">-{formatCurrency(transaction.amount)}</p>
<p className="text-xs text-gray-500">{transaction.category}</p>
</div>
</div>
))
) : (
<div className="py-4 text-center text-gray-500">
</div>) : <div className="py-4 text-center text-gray-500">
</div>
)}
</div>}
</div>
{selectedTransaction && (
<TransactionEditDialog
transaction={selectedTransaction}
open={isDialogOpen}
onOpenChange={setIsDialogOpen}
onSave={handleUpdateTransaction}
onDelete={handleDeleteTransaction}
/>
)}
</div>
);
{selectedTransaction && <TransactionEditDialog transaction={selectedTransaction} open={isDialogOpen} onOpenChange={setIsDialogOpen} onSave={handleUpdateTransaction} onDelete={handleDeleteTransaction} />}
</div>;
};
export default RecentTransactionsSection;

View File

@@ -12,11 +12,13 @@ interface CategorySpending {
interface CategorySpendingListProps {
categories: CategorySpending[];
totalExpense: number;
className?: string;
}
const CategorySpendingList: React.FC<CategorySpendingListProps> = ({
categories,
totalExpense
totalExpense,
className = ""
}) => {
const isMobile = useIsMobile();
@@ -31,7 +33,7 @@ const CategorySpendingList: React.FC<CategorySpendingListProps> = ({
};
return (
<div className="neuro-card mb-6 w-full">
<div className={`neuro-card mb-6 w-full ${className}`}>
{categories.some(cat => cat.current > 0) ? (
<div className="space-y-4">
{categories.map((category) => (

View File

@@ -164,6 +164,7 @@ const Analytics = () => {
<CategorySpendingList
categories={categorySpending}
totalExpense={totalExpense}
className="mb-[50px]"
/>
</div>

View File

@@ -155,7 +155,7 @@ const Transactions = () => {
{/* Transactions By Date */}
{!isLoading && transactions.length > 0 && (
<div className="space-y-6">
<div className="space-y-6 mb-[50px]">
{Object.entries(groupedTransactions).map(([date, transactions]) => (
<div key={date}>
<div className="flex items-center gap-2 mb-3">