diff --git a/src/components/ExpenseList.js b/src/components/ExpenseList.js index e35592a..c0ef267 100644 --- a/src/components/ExpenseList.js +++ b/src/components/ExpenseList.js @@ -102,7 +102,6 @@ const ExpenseList = () => { var row = ` ${data1[i]} $${data2[i]} - ` table.innerHTML += row @@ -110,14 +109,12 @@ const ExpenseList = () => { } } - buildTable(category, transaction, time); + buildTable(category, transaction, time); async function fetchTransactions() { const categories = await getTransactionsCategory(); const transaction_balance = await getTransactionsBalance(); const date = await getDate(); - - setCategories(categories); setTransactions(transaction_balance); @@ -141,7 +138,7 @@ const ExpenseList = () => {

Recent Transactions

{/*

{category}

{transaction}

*/} - +
diff --git a/src/components/ExpenseTotal.js b/src/components/ExpenseTotal.js index 5229bdd..e62fbb6 100644 --- a/src/components/ExpenseTotal.js +++ b/src/components/ExpenseTotal.js @@ -23,7 +23,7 @@ const ExpenseTotal = () => { }, []) return ( -
+
This Month's Expenses:

${expense}

diff --git a/src/components/Remaining.js b/src/components/Remaining.js index bb884df..9441335 100644 --- a/src/components/Remaining.js +++ b/src/components/Remaining.js @@ -55,14 +55,33 @@ export default function Remaining() { console.error(error); } } + async function getIncome() { + try { + const response = await fetch('https://api.bb.gabefarrell.com/w/income/month', { + method: 'GET', + headers: { + 'x-session-key': getSessionKey(), + }, + }); + const data = await response.json(); + const whole = data.whole; + const decimal = data.decimal; + const total_expenses = whole + '.' + decimal; + console.log(total_expenses + "<- Income By Month"); + return Number(total_expenses); + } catch (error) { + console.error(error); + } + } async function fetchBudget() { const name = await getBudget(); const expenses = await getMonthlyExpenses(); - const budget_remaining = (name - expenses).toFixed(2); + + const income = await getIncome(); + const budget_remaining = (name - expenses + income).toFixed(2); setBudget(budget_remaining); } useEffect(() => { - fetchBudget(); }, []) diff --git a/src/components/css/ExpenseList.css b/src/components/css/ExpenseList.css index 9818eb6..460883e 100644 --- a/src/components/css/ExpenseList.css +++ b/src/components/css/ExpenseList.css @@ -1,6 +1,6 @@ td { padding-top: 8px; padding-bottom: 8px; - padding-left: 50px; + padding-left: 20px; border: 1px solid; } \ No newline at end of file