From 4114c702dabcee7ddb04041b04112f00c8bb0ba5 Mon Sep 17 00:00:00 2001
From: Chris <colah2123@outlook.com>
Date: Tue, 25 Apr 2023 13:15:46 -0400
Subject: [PATCH] CSS Styling

---
 src/components/ExpenseList.js       | 41 ++++++++++++++++++++++++-----
 src/components/ExpenseTotal.js      |  7 ++---
 src/components/Remaining.js         |  9 ++++---
 src/components/ViewBudget.js        |  4 ++-
 src/components/css/ExpenseList.css  |  6 +++++
 src/components/css/ExpenseTotal.css | 18 ++++++++++---
 src/components/css/Remaining.css    | 15 +++++++++--
 src/components/css/ViewBudget.css   | 17 ++++++++----
 src/pages/Dashboard.jsx             |  6 ++---
 9 files changed, 97 insertions(+), 26 deletions(-)
 create mode 100644 src/components/css/ExpenseList.css

diff --git a/src/components/ExpenseList.js b/src/components/ExpenseList.js
index 468de76..e35592a 100644
--- a/src/components/ExpenseList.js
+++ b/src/components/ExpenseList.js
@@ -1,14 +1,14 @@
 import React, { useContext, useState, useEffect } from 'react';
 import ExpenseItem from './ExpenseItem';
 import { AppContext } from '../context/AppContext';
-
-
+import './css/ExpenseList.css'
 
 const ExpenseList = () => {
 	const [whole, setWhole] = useState('');
 	const [decimal, setDecimal] = useState('');
 	const [transaction, setTransactions] = useState('');
 	const [category, setCategories] = useState('');
+	const [time, setTime] = useState('');
 
 	function getSessionKey() {
 		var cookies = document.cookie.split(';');
@@ -68,13 +68,41 @@ const ExpenseList = () => {
 		}
 	  }
 
-	  async function buildTable(data1, data2){
+	  async function getDate() {
+		try {
+		  const response = await fetch('https://api.bb.gabefarrell.com/w/transactions/recent', {
+			method: 'GET',
+			headers: {
+			  'x-session-key': getSessionKey(),
+			},
+		  });
+		  const data = await response.json();
+		  const timestamp = data.transactions.map((item)=>item.timestamp);
+		  let dateFormat = [];
+		  let date, month, day;
+		  for (let i = 0; i < timestamp.length; i++) {
+			date = new Date(timestamp[i]);
+			month = date.getMonth();
+			day = date.getDay();
+			console.log(month, day);
+			dateFormat.push(month + '/' + day);
+		  }
+		 //let dateFormat = new Date(timestamp[0]);
+		//    console.log(date); 
+		  return dateFormat;
+		} catch (error) {
+		  console.error(error);
+		}
+	  }
+
+	  async function buildTable(data1, data2, data3){
 			var table = document.getElementById('myTable')
 	
 			for (var i = 0; i < data1.length; i++){
 				var row = `<tr>
 								<td>${data1[i]}</td>
-								<td>${data2[i]}</td>
+								<td>$${data2[i]}</td>
+								
 						  </tr>`
 				table.innerHTML += row
 	
@@ -82,17 +110,18 @@ const ExpenseList = () => {
 			}
 		}
 		
-		buildTable(category, transaction);
+		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);
-
+		setTime(date);
 	}
 	
 	useEffect(() => {
diff --git a/src/components/ExpenseTotal.js b/src/components/ExpenseTotal.js
index 8e51540..a43b1e7 100644
--- a/src/components/ExpenseTotal.js
+++ b/src/components/ExpenseTotal.js
@@ -23,9 +23,10 @@ const ExpenseTotal = () => {
 	}, [])
 
 	return (
-		<div className='widget p-4'>
-			<img src={logo} className='expenseTotalIcon'></img>
-			<span className='widgetText'>This Month's Expenses: ${expense}</span>
+		<div>
+			<h5 class="textttt">This Month's Expenses:</h5>
+			<img src={logo} class="imageee"></img>
+			<h1 class="displayyyy">${expense}</h1>
 		</div>
 	);
 };
diff --git a/src/components/Remaining.js b/src/components/Remaining.js
index 370dfcc..0e263c7 100644
--- a/src/components/Remaining.js
+++ b/src/components/Remaining.js
@@ -1,6 +1,6 @@
 import React, {useState, useEffect} from 'react';
-import './css/ViewBudget.css'
-import logo from './widget_logos/current_balance_logo.png';
+import './css/Remaining.css'
+import logo from './widget_logos/budget_logo.png';
 
 export default function Remaining() {
 	const [budget, setBudget] = useState('');
@@ -107,7 +107,10 @@ export default function Remaining() {
 			{/* <img src={logo}></img> 
 			<span>Current Balance: ${data}</span> */}
 			{/* <button onClick={apiGet()}> TEST</button> */}
-			 <h1>{budget}</h1> 
+			 <h5 class="text">Budget Remaining</h5>
+			 
+			 
+			 <img src={logo} class="image"></img><h1 class="display">${budget}</h1> 
 			 <form id="form" onSubmit={handleSubmit}>
       			<input 
 				type = "text"
diff --git a/src/components/ViewBudget.js b/src/components/ViewBudget.js
index c53ee6a..ea7799d 100644
--- a/src/components/ViewBudget.js
+++ b/src/components/ViewBudget.js
@@ -110,7 +110,9 @@ export default function FetchAPI() {
 			{/* <img src={logo}></img> 
 			<span>Current Balance: ${data}</span> */}
 			{/* <button onClick={apiGet()}> TEST</button> */}
-			 <h1>{balance}</h1> 
+			<h5 class="text">Current Balance</h5>
+			<img src={logo} class="imagee"></img>
+			 <h1 class="displayy">${balance}</h1> 
 			 <form id="form" onSubmit={handleSubmit}>
       			<input 
 				type = "text"
diff --git a/src/components/css/ExpenseList.css b/src/components/css/ExpenseList.css
new file mode 100644
index 0000000..9818eb6
--- /dev/null
+++ b/src/components/css/ExpenseList.css
@@ -0,0 +1,6 @@
+td {
+    padding-top: 8px;
+  padding-bottom: 8px;
+  padding-left: 50px;
+  border: 1px solid;
+}
\ No newline at end of file
diff --git a/src/components/css/ExpenseTotal.css b/src/components/css/ExpenseTotal.css
index de22b4c..cc8c7f2 100644
--- a/src/components/css/ExpenseTotal.css
+++ b/src/components/css/ExpenseTotal.css
@@ -1,4 +1,16 @@
-.widgetText {
-    padding-left: 1em;
-    color: #333;
+.imageee {
+    margin-top: 50px;
+    margin-left: 20px;
+    max-width: 50px;
+}
+
+.displayyyy {
+    margin-top: 50px;
+    margin-left: 120px;
+    float: right;
+}
+
+.textttt {
+    position: fixed;
+    top: 10px;
 }
\ No newline at end of file
diff --git a/src/components/css/Remaining.css b/src/components/css/Remaining.css
index b940916..fbf9f08 100644
--- a/src/components/css/Remaining.css
+++ b/src/components/css/Remaining.css
@@ -1,3 +1,14 @@
-img {
-    width: 50px;
+.image {
+    margin-top: 50px;
+    margin-left: 20px;
+    width: 70px;
+}
+
+.display {
+    margin-top: 50px;
+}
+
+.text {
+    position: fixed;
+    top: 10px;
 }
\ No newline at end of file
diff --git a/src/components/css/ViewBudget.css b/src/components/css/ViewBudget.css
index 7f4c435..b74a6eb 100644
--- a/src/components/css/ViewBudget.css
+++ b/src/components/css/ViewBudget.css
@@ -1,7 +1,14 @@
+.imagee {
+    margin-top: 50px;
+    margin-left: 20px;
+    width: 50px;
+}
 
-/* MAKE SURE TO BE SPECIFIC WITH STYLING CUZ THIS CHANGED DIFFERENT SPANS
-span {
-    float: right;
-    margin-right: 50px;
+.displayy {
+    margin-top: 50px;
 }
-*/
\ No newline at end of file
+
+.text {
+    position: fixed;
+    top: 10px;
+}
\ No newline at end of file
diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard.jsx
index 723da7a..33401d0 100644
--- a/src/pages/Dashboard.jsx
+++ b/src/pages/Dashboard.jsx
@@ -3,7 +3,7 @@ import  { useState } from 'react'
 import 'bootstrap/dist/css/bootstrap.min.css';
 
 import { AppProvider } from '../context/AppContext';
-import FetchAPI from '../components/budget';
+import FetchAPI from '../components/Budget';
 import ExpenseTotal from '../components/ExpenseTotal';
 import ExpenseList from '../components/ExpenseList';
 import AddExpenseForm from '../components/AddExpenseForm';
@@ -27,8 +27,8 @@ export default function Dashboard() {
 					<div className='col-sm widget d-flex align-items-center justify-content-between'>
 						<RemainingBudget />
 					</div>
-					<div className='col-sm'>
-						{/* <ExpenseTotal /> */}
+					<div className='col-sm widget d-flex align-items-center justify-content-between'>
+						<ExpenseTotal />
 					</div>
 				</div>