From 28a923fcd748727354cab2c74f08b322bdf7a4ce Mon Sep 17 00:00:00 2001 From: Keith Solomon Date: Fri, 23 Dec 2022 17:53:44 +0000 Subject: [PATCH] - Display overall vault balance - Add Roboto google font --- functions.php | 12 +++++++++--- index.php | 7 ++++++- style.css | 13 +++++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/functions.php b/functions.php index f505968..c5f0cef 100644 --- a/functions.php +++ b/functions.php @@ -185,7 +185,13 @@ function arrBalance($array, $field) { // vaultBalance(): Calculate overall vault balance function vaultBalance($csv) { + $vaultBalance = arrBalance($csv,3); + $vaultSpace = formatMoney(1000000000-$vaultBalance); + echo '
'; + echo '

Vault Balance: '.formatMoney($vaultBalance).'

'; + echo '

Vault space left: '.$vaultSpace.'

'; + echo '
'; } // userBalances(): Calculate per-user vault balances @@ -198,16 +204,16 @@ function userBalances($csv) { $usr2 = 'Symos'; $usr2Vault = splitVault($csv, '0', $usr2); $usr2Balance = arrBalance($usr2Vault,3); - $usr2Share = formatMoney(500000000-$usr1Balance); + $usr2Share = formatMoney(500000000-$usr2Balance); echo '
'; echo '

'.$usr1.' balance: '.formatMoney($usr1Balance).'

'; - echo '

'.$usr1.' share left: '.$usr1Share.'

'; + echo '

'.$usr1.' share left: '.$usr1Share.'

'; echo '
'; echo '
'; echo '

'.$usr2.' balance: '.formatMoney($usr2Balance).'

'; - echo '

'.$usr2.' share left: '.$usr2Share.'

'; + echo '

'.$usr2.' share left: '.$usr2Share.'

'; echo '
'; } ?> \ No newline at end of file diff --git a/index.php b/index.php index 62a8463..ef056de 100644 --- a/index.php +++ b/index.php @@ -10,6 +10,10 @@ Torn Vault Tracker + + + + @@ -25,7 +29,8 @@

Balances

-

Vault Balance:

+ +
diff --git a/style.css b/style.css index 947ac79..07a0473 100644 --- a/style.css +++ b/style.css @@ -1,9 +1,12 @@ :root { - --red: #f77e82; + --red: #f77e82; --green: #08817d; } -body { padding: 0 1em; } +body { + font-family: 'Roboto', sans-serif; + padding: 0 1em; +} .grid { display: grid; @@ -35,6 +38,8 @@ td { padding: .15em 1em; } h1 { } -h3, h4 { margin: 0; } +.vault h2, h3, h4 { margin: 0; } -h4 { font-style: italic; } \ No newline at end of file +.vault h3, h4 { font-style: italic; } + +.vault { margin: 0 0 1em; } \ No newline at end of file