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