Finance Tracker

Author: venom2003op

Projects/Finance Tracker/index.html

@@ -5,11 +5,6 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="styles.css">
-<<<<<<< HEAD
-
-=======
-    
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
 
     <title>Personal Finance Tracker</title>
 </head>
@@ -66,7 +61,6 @@ <h2>Transaction History</h2>
             <p id="noTransactionMessage">No transactions yet.</p>
         </section>
         <section id="bottom"></section>
-<<<<<<< HEAD
 
     </main>
 
@@ -75,13 +69,3 @@ <h2>Transaction History</h2>
 </body>
 
 </html>
-=======
-        
-    </main>
-
-    <script src="index.js"></script>
-    
-</body>
-
-</html>
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31

Projects/Finance Tracker/index.js

@@ -25,7 +25,6 @@ function updateBalance() {
     const balance = transactions.reduce((acc, transaction) => {
       return transaction.type === "income" ? acc + transaction.amount : acc - transaction.amount;
     }, 0);
-<<<<<<< HEAD
 
     totalIncome = transactions.reduce((acc, transaction) => {
       return transaction.type === "income" ? acc + transaction.amount : acc;
@@ -35,17 +34,6 @@ function updateBalance() {
       return transaction.type === "expense" ? acc + transaction.amount : acc;
     }, 0);
 
-=======
-  
-    totalIncome = transactions.reduce((acc, transaction) => {
-      return transaction.type === "income" ? acc + transaction.amount : acc;
-    }, 0);
-  
-    totalExpense = transactions.reduce((acc, transaction) => {
-      return transaction.type === "expense" ? acc + transaction.amount : acc;
-    }, 0);
-  
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
     balanceAmount.textContent = balance.toFixed(2);
     incomeAmount.textContent = totalIncome.toFixed(2);
     expenseAmount.textContent = totalExpense.toFixed(2);
@@ -65,13 +53,8 @@ function addTransaction(event) {
         amount,
         type
     };
-<<<<<<< HEAD
 
 
-=======
-    
-    
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
     transactions.push(transaction);
     if(type==="income"){
         totalIncome+=amount;
@@ -101,11 +84,6 @@ function deleteTransaction(index) {
     updateTransactions();
     updateBalance();
     saveTransactions();
-<<<<<<< HEAD
-
-=======
-    
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
 }
 
 // Function to save transactions to Local Storage
@@ -159,33 +137,18 @@ function editTransaction(index) {
             amount: updatedAmount,
             type: updatedType
           };
-<<<<<<< HEAD
-
-=======
-      
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
           if (transaction.type === "income") {
             totalIncome -= transaction.amount;
             totalIncome += updatedAmount;
           } else if (transaction.type === "expense") {
             totalExpense -= transaction.amount;
             totalExpense += updatedAmount;
           }
-<<<<<<< HEAD
-
-=======
-      
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
         transactions[index] = updatedTransaction;
         alert(`Transaction "${updatedTransaction.description}" updated successfully!`);
         updateTransactions();
         updateBalance();
         saveTransactions();
-<<<<<<< HEAD
-
-=======
-        
->>>>>>> a548c639afa0f1ac1cdb441c63180145b7acef31
     } else {
         alert("Invalid input! Please try again.");
     }