Skip to content

Commit 1dc0efc

Browse files
committed
Added ExpenseList component
1 parent f46bd28 commit 1dc0efc

File tree

4 files changed

+40
-22
lines changed

4 files changed

+40
-22
lines changed

Sections/Section 3/01-starting-setup/src/components/Expenses/ExpenseItem.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import Card from '../UI/Card'
44

55
const ExpenseItem = (props) => {
66
return (
7-
<Card className="expense-item">
8-
<ExpenseDate date={props.date}/>
9-
<div className="expense-item__description">
10-
<h2>{props.title}</h2>
11-
<div className="expense-item__price">${props.amount}</div>
12-
</div>
13-
</Card>
7+
<li>
8+
<Card className="expense-item">
9+
<ExpenseDate date={props.date}/>
10+
<div className="expense-item__description">
11+
<h2>{props.title}</h2>
12+
<div className="expense-item__price">${props.amount}</div>
13+
</div>
14+
</Card>
15+
</li>
1416
)
1517
}
1618

Sections/Section 3/01-starting-setup/src/components/Expenses/Expenses.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import './Expenses.css'
2-
import ExpenseItem from './ExpenseItem'
2+
import ExpensesList from './ExpensesList'
33
import Card from '../UI/Card'
44
import ExpensesFilter from './ExpensesFilter'
55
import { useState } from 'react'
@@ -15,24 +15,11 @@ const Expenses = (props) => {
1515
return expense.date.getFullYear().toString() === filteredYear;
1616
})
1717

18-
let expensesContent = <p>No expenses Found</p>
19-
20-
if(filteredExpenses.length > 0) {
21-
expensesContent = filteredExpenses.map((expense) => (
22-
<ExpenseItem
23-
title={expense.title}
24-
amount={expense.amount}
25-
date={expense.date}
26-
key={expense.id}
27-
/>
28-
))
29-
}
30-
3118
return(
3219
<div>
3320
<Card className='expenses'>
3421
<ExpensesFilter selected={filteredYear} onChangeFilter={filterChangeHandler}/>
35-
{expensesContent}
22+
<ExpensesList items = {filteredExpenses}/>
3623
</Card>
3724
</div>
3825
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.expenses-list {
2+
list-style: none;
3+
padding: 0;
4+
}
5+
6+
.expenses-list__fallback {
7+
color: white;
8+
text-align: center;
9+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import ExpenseItem from './ExpenseItem'
2+
import './ExpensesList.css'
3+
const ExpensesList = props => {
4+
if(props.items.length === 0){
5+
return <h2 className='expenses-list__fallback'>Found no expenses.</h2>
6+
}
7+
8+
return <ul className='expenses-list'>
9+
{props.items.map((expense) => (
10+
<ExpenseItem
11+
title={expense.title}
12+
amount={expense.amount}
13+
date={expense.date}
14+
key={expense.id}
15+
/>
16+
))}
17+
</ul>
18+
}
19+
20+
export default ExpensesList

0 commit comments

Comments
 (0)