Update interface with better table layout

2 files changed, 77 insertions, 17 deletions

diff --git a/static/css/main.css b/static/css/main.css
index d8c567e..4b9553e 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Crimson+Text:ital@0;1&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Crimson+Text:ital,wght@0,400;0,700;1,400&display=swap');
 * {
     margin: 0;
     padding: 0;
@@ -22,6 +22,7 @@ body {
     padding: 0;
     display: flex;
     justify-content: center;
+    font-weight: 400;
     font-family: 'Crimson Text', serif;
 }
 
@@ -46,8 +47,7 @@ label {
 
 input[type="text"] {
     font-size: 1rem;
-    font-weight: bold;
-    color: #8b6b00;
+    color: #472504;
     font-family: 'Crimson Text', serif;
     background-color: rgba(183, 154, 26, 0.2);
     border: 2px solid #795b00;
@@ -138,7 +138,7 @@ input[type="submit"] {
 .calculator {
     width: 100%;
     max-width: 460px;
-    padding: 20px;
+    padding: 20px 20px 0px 20px;
     background-color: #ffefd0bd;
     border: 2px solid Gold;
     border-radius: 8px;
@@ -183,12 +183,11 @@ input[type="submit"] {
 }
 
 .blockquote {
-    padding: 20px;
+    padding: 15px;
 }
 
 .quote {
-    font-size: 1.4rem;
-    line-height: 1.4;
+    font-size: 1.1rem;
     font-style: italic;
     text-align: justify;
 }
@@ -197,7 +196,7 @@ input[type="submit"] {
     margin-top: 0.5em;
     border-top: 1px solid #795b00;
     padding-top: 0.5em;
-    font-weight: 700;
+    font-weight: 400;
     font-family: 'Crimson Text', serif;
     color: #792200;
     font-size: 12px;
@@ -212,10 +211,42 @@ a:hover {
     color: #9b7a0d;
 }
 
+table {
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #795b00;
+    border-radius: 8px;
+    margin-bottom: 1em;
+    font-size: 1.1rem;
+}
+
+td {
+    border-right: 1px solid #795b00;
+    padding: 0.5em;
+}
+
+tr {
+    border-bottom: 1px solid #795b00;
+}
+
+td:first-child {
+    font-weight: 700;
+}
+
+td:last-child {
+    text-align: right;
+    font-weight: 400;
+}
+
+tr:last-child {
+    border-top: 2px solid #795b00;
+}
+
+
 .credit-text {
     font-size: 12px;
-    font-weight: 700;
     color: #2e345a;
+    padding: 15px;
 }
 
 #result {
diff --git a/static/js/script.js b/static/js/script.js
index 9c4cc0e..caf78d1 100644
--- a/static/js/script.js
+++ b/static/js/script.js
@@ -11,7 +11,9 @@ function commaSeparateNumber(val) {
 
 numInputs.forEach((input) => {
     input.addEventListener("keyup", (e) => {
-        const num = e.target.value.replace(/\D/g, "");
+        const value = e.target.value;
+        const formattedValue = commaSeparateNumber(value.replace(/\D/g, ""));
+        e.target.value = formattedValue;
     });
 });
 
@@ -22,15 +24,42 @@ calculateForm.addEventListener("submit", (e) => {
     const reducedTaxes = document.getElementById("taxrates");
     const buyTaxRate = 0.05;
     const sellTaxRate = reducedTaxes.checked ? 0.03 : 0.05;
-    const buyPriceValue = buyPrice.value.replace(/\D/g, "");
-    const sellPriceValue = sellPrice.value.replace(/\D/g, "");
+    const buyPriceValue = parseInt(buyPrice.value.replace(/\D/g, ""));
+    const sellPriceValue = parseInt(sellPrice.value.replace(/\D/g, ""));
     const buyTax = Math.ceil(buyPriceValue * buyTaxRate);
     const sellTax = Math.ceil(sellPriceValue * sellTaxRate);
     const profit = sellPriceValue - buyPriceValue - buyTax - sellTax;
-    
-    const resultStatement = `For an item listed at ${commaSeparateNumber(buyPriceValue)} Gil, you will pay ${commaSeparateNumber(buyTax)} Gil in taxes. If you sell the item for ${commaSeparateNumber(sellPriceValue)} Gil, you will pay ${commaSeparateNumber(sellTax)} Gil in taxes. After all taxes are paid, you will ${profit > 0 ? "<span class='profit'>make a profit</span>" : "<span class='loss'>suffer a loss</span>"} of ${commaSeparateNumber(Math.abs(profit))} Gil.`;
-    const statementElement = document.createElement("p");
-    statementElement.innerHTML = resultStatement;
+    const timesProfit  = profit / (buyPriceValue + buyTax);
+
+    const resultDisplay = `
+        <table class="result-display">
+            <tr>
+                <td>Buying Cost:</td>
+                <td>${commaSeparateNumber(buyPriceValue)} Gil</td>
+            </tr>
+            <tr>
+                <td>Buying Tax:</td>
+                <td>${commaSeparateNumber(buyTax)} Gil</td>
+            </tr>
+            <tr>
+                <td>Selling Cost:</td>
+                <td>${commaSeparateNumber(sellPriceValue)} Gil</td>
+            </tr>
+            <tr>
+                <td>Selling Tax:</td>
+                <td>${commaSeparateNumber(sellTax)} Gil</td>
+            </tr>
+            <tr>
+                <td>${profit > 0 ? "Profit" : "Loss"}:</td>
+                <td><span class="${profit > 0 ? "profit" : "loss"}">${commaSeparateNumber(Math.abs(profit))}</span> Gil 
+                ${profit > 0 ? `(${timesProfit.toFixed(2)}x returns)` : `(${timesProfit.toFixed(2)}x loss)`}</td>
+                </td>
+            </tr>
+        </table>
+    `;
+
+    const resultElement = document.createElement("div");
+    resultElement.innerHTML = resultDisplay;
     result.innerHTML = "";
-    result.appendChild(statementElement);
+    result.appendChild(resultElement);
 });