diff --git a/.gitignore b/.gitignore index b6e47617de..dc00b0bc92 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ dmypy.json # Pyre type checker .pyre/ +node_modules diff --git a/src/App.js b/src/App.js index 610e47d694..58ef349ed0 100644 --- a/src/App.js +++ b/src/App.js @@ -1,47 +1,48 @@ import React from 'react'; - import 'bootstrap/dist/css/bootstrap.min.css'; -//Code to import Budget.js +import { AppProvider } from './context/AppContext'; import Budget from './components/Budget'; +import ExpenseTotal from './components/ExpenseTotal'; +import ExpenseList from './components/ExpenseList'; +import AllocationForm from './components/AllocationForm'; +import RemainingBudget from './components/Remaining'; +import Currency from './components/Currency' -// Add code to import the other components here under - - -import { AppProvider } from './context/AppContext'; const App = () => { return (

Company's Budget Allocation

-
-     { - /* Add Budget component here */ - } - -     { - /* Add Remaining component here*/ - } - -     { - /* Add ExpenseTotal component here */ - } - -     { - /* Add ExpenseList component here */ - } - -     { - /* Add ExpenseItem component here */ - } - -     { - /* Add AllocationForm component here under */ - } - +
+
+ +
+
+ +
+
+ +
+
+ +
+
+

Allocation

+
+
+ +
+
+

Change allocation

+
+
+ +
); }; + export default App; diff --git a/src/components/AllocationForm.js b/src/components/AllocationForm.js index 8b13789179..4de6729a27 100644 --- a/src/components/AllocationForm.js +++ b/src/components/AllocationForm.js @@ -1 +1,81 @@ +import React, { useContext, useState } from 'react'; +import { AppContext } from '../context/AppContext'; +const AllocationForm = (props) => { + const { dispatch,remaining,currency } = useContext(AppContext); + + const [name, setName] = useState(''); + const [cost, setCost] = useState(''); + const [action, setAction] = useState(''); + + const submitEvent = () => { + + if(cost > remaining) { + alert("The value cannot exceed remaining funds £"+remaining); + setCost(""); + return; + } + + const expense = { + name: name, + cost: parseInt(cost), + }; + if(action === "Reduce") { + dispatch({ + type: 'RED_EXPENSE', + payload: expense, + }); + } else { + dispatch({ + type: 'ADD_EXPENSE', + payload: expense, + }); + } + }; + + return ( +
+
+ +
+
+ +
+ + +
+ +
+ + + {currency} setCost(event.target.value)}> + + + +
+
+ +
+ ); +}; + +export default AllocationForm; diff --git a/src/components/Budget.js b/src/components/Budget.js index 8b13789179..eba653e802 100644 --- a/src/components/Budget.js +++ b/src/components/Budget.js @@ -1 +1,33 @@ +import React, { useContext, useState } from 'react'; +import { AppContext } from '../context/AppContext'; +const Budget = () => { + const { budget, dispatch, expenses, currency } = useContext(AppContext); + const [newBudget, setNewBudget] = useState(budget); + const handleBudgetChange = (event) => { + + const totalExpenses = expenses.reduce((total, item) => { + return (total = total + item.cost); + }, 0); + + if(event.target.value > 20000){ + alert('The upper limit value is 20,000'); + return; + } + + setNewBudget(event.target.value); + + dispatch({ + type: 'SET_BUDGET', + payload: event.target.value, + }); + + } + return ( +
+Budget: {currency}{newBudget} + +
+ ); +}; +export default Budget; diff --git a/src/components/Currency.js b/src/components/Currency.js new file mode 100644 index 0000000000..eeaa213b9a --- /dev/null +++ b/src/components/Currency.js @@ -0,0 +1,35 @@ +import React, { useContext, useState } from 'react'; +import { AppContext } from '../context/AppContext'; + +const Currency = () => { + const { currency, dispatch } = useContext(AppContext); + const [newCurrency, setNewCurrency] = useState(currency); + + const handleCurrencyChange = (event) => { + + setNewCurrency(event.target.value); + + dispatch({ + type: 'CHG_CURRENCY', + payload: event.target.value, + }); + + } + + + return ( + + + ); + + + +}; + + +export default Currency; diff --git a/src/components/ExpenseItem.js b/src/components/ExpenseItem.js index 8b13789179..e738d053e7 100644 --- a/src/components/ExpenseItem.js +++ b/src/components/ExpenseItem.js @@ -1 +1,55 @@ +import React, { useContext } from 'react'; +import { TiDelete } from 'react-icons/ti'; +import { AppContext } from '../context/AppContext'; +const ExpenseItem = (props) => { + const { dispatch,currency } = useContext(AppContext); + + const handleDeleteExpense = () => { + dispatch({ + type: 'DELETE_EXPENSE', + payload: props.id, + }); + }; + + const increaseAllocation = (name) => { + const expense = { + name: name, + cost: 10, + }; + + + + dispatch({ + type: 'ADD_EXPENSE', + payload: expense + }); + + } + + const decreaseAllocation = (name) => { + const expense = { + name: name, + cost: 10, + }; + + dispatch({ + type: 'RED_EXPENSE', + payload: expense + }); + } + + + + return ( + + {props.name} + {currency}{props.cost} + + + + + ); +}; + +export default ExpenseItem; diff --git a/src/components/ExpenseList.js b/src/components/ExpenseList.js index 8b13789179..c41d204ae3 100644 --- a/src/components/ExpenseList.js +++ b/src/components/ExpenseList.js @@ -1 +1,28 @@ +import React, { useContext } from 'react'; +import ExpenseItem from './ExpenseItem'; +import { AppContext } from '../context/AppContext'; +const ExpenseList = () => { + const { expenses } = useContext(AppContext); + + return ( + + + + + + + + + + + + {expenses.map((expense) => ( + + ))} + +
DepartmentAllocated BudgetIncrease by 10Decrease by 10Delete
+ ); +}; + +export default ExpenseList; diff --git a/src/components/ExpenseTotal.js b/src/components/ExpenseTotal.js index 8b13789179..1ab1c284c7 100644 --- a/src/components/ExpenseTotal.js +++ b/src/components/ExpenseTotal.js @@ -1 +1,15 @@ +import React, { useContext } from 'react'; +import { AppContext } from '../context/AppContext'; +const ExpenseTotal = () => { + const { expenses, currency } = useContext(AppContext); + const totalExpenses = expenses.reduce((total, item) => { + return (total += item.cost); + }, 0); + return ( +
+ Spent so far: {currency}{totalExpenses} +
+ ); +}; +export default ExpenseTotal; diff --git a/src/components/Remaining.js b/src/components/Remaining.js index 8b13789179..9dcc151f6b 100644 --- a/src/components/Remaining.js +++ b/src/components/Remaining.js @@ -1 +1,18 @@ - +import React, { useContext } from 'react'; +import { AppContext } from '../context/AppContext'; +const Remaining = () => { + const { expenses, budget,currency } = useContext(AppContext); + const totalExpenses = expenses.reduce((total, item) => { + return (total = total + item.cost); + }, 0); + const alertType = totalExpenses > budget ? 'alert-danger' : 'alert-success'; + if(totalExpenses > budget){ + alert('you cannot reduce the budget value lower than spending'); + } + return ( +
+ Remaining: {currency}{budget - totalExpenses} +
+ ); +}; +export default Remaining;