diff options
author | RaindropsSys <raindrops@equestria.dev> | 2023-10-08 10:32:18 +0200 |
---|---|---|
committer | RaindropsSys <raindrops@equestria.dev> | 2023-10-08 10:32:18 +0200 |
commit | 4b76f46ac0d509bd0100cb593442e4d5d5601b29 (patch) | |
tree | d9b3de625133790be95e6519673c1d92a7b6450d | |
parent | d8f3e12df86424d456c7de2f090fcb60e3b69854 (diff) | |
download | pluralconnect-4b76f46ac0d509bd0100cb593442e4d5d5601b29.tar.gz pluralconnect-4b76f46ac0d509bd0100cb593442e4d5d5601b29.tar.bz2 pluralconnect-4b76f46ac0d509bd0100cb593442e4d5d5601b29.zip |
Updated 2 files and added .idea/sshConfigs.xml (automated)
-rw-r--r-- | .idea/sshConfigs.xml | 8 | ||||
-rw-r--r-- | .idea/webServers.xml | 9 | ||||
-rw-r--r-- | pages/money.inc | 20 |
3 files changed, 36 insertions, 1 deletions
diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml new file mode 100644 index 0000000..5ba0660 --- /dev/null +++ b/.idea/sshConfigs.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="SshConfigs"> + <configs> + <sshConfig authType="OPEN_SSH" host="bridlewood" id="7e5719c4-4001-4a83-8a12-1998eaed2645" port="22" nameFormat="DESCRIPTIVE" username="fedora" useOpenSSHConfig="true" /> + </configs> + </component> +</project>
\ No newline at end of file diff --git a/.idea/webServers.xml b/.idea/webServers.xml index e2155f0..c7fe736 100644 --- a/.idea/webServers.xml +++ b/.idea/webServers.xml @@ -3,7 +3,14 @@ <component name="WebServers">
<option name="servers">
<webServer id="3e51e028-6d99-4850-bcea-1bcc0c8331b5" name="Minteck.org (project level)">
- <fileTransfer accessType="SFTP" host="zephyrheights.equestria.dev" port="2222" sshConfigId="7a8d95bc-b529-4c35-8032-421139fb8410" sshConfig="root@zephyrheights.equestria.dev:2222 key" keyPair="true">
+ <fileTransfer accessType="SFTP" sshConfigId="7a8d95bc-b529-4c35-8032-421139fb8410" sshConfig="root@zephyrheights.equestria.dev:2222 key">
+ <advancedOptions>
+ <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+ </advancedOptions>
+ </fileTransfer>
+ </webServer>
+ <webServer id="f1705a9f-a502-4faa-acb1-dc52250bf7bc" name="bridlewood">
+ <fileTransfer accessType="SFTP" host="bridlewood" port="22" sshConfigId="7e5719c4-4001-4a83-8a12-1998eaed2645" sshConfig="fedora@bridlewood:22 agent" authAgent="true">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
diff --git a/pages/money.inc b/pages/money.inc index d0ec635..3791d8e 100644 --- a/pages/money.inc +++ b/pages/money.inc @@ -401,6 +401,26 @@ function getMonthlyEarnings(): array { </div> <p style="text-align: center; margin-top: 5px;" class="<?= $allAccounts > $minimumCloudburst ? "" : "bold text-danger" ?>">£<?= number_format($difference, 2, '.', ',') ?><?php if ($allAccounts > $minimumCloudburst): ?> (<?= round($part2 * 100, 2) ?>%)<?php endif; ?> <?= $allAccounts > $minimumCloudburst ? "over" : "under" ?> the minimum</p> + <?php if (isset($projects["cloudburst"]) && $projects["cloudburst"]["enable"]): ?> + <div class="grid" style="margin-bottom: 10px; display: grid; grid-template-columns: 25% 1fr; grid-gap: 20px;"> + <div style="width: 100%; display: flex; align-items: center; justify-content: center;"> + <img src="<?= $projects["cloudburst"]["image"] ?>" style="width: 100%;"> + </div> + <div style="display: flex; align-items: center;"> + <div style="width: 100%;"> + <h2><?= strip_tags($projects["cloudburst"]["name"]) ?></h2> + <div class="progress" style="margin-top: 20px; margin-bottom: 20px; width: 100%; background-color: #222;"> + <div class="progress-bar bg-success" style="width: <?= ($allAccounts - $minimumRaindrops >= 0) ? (($allAccounts - $minimumRaindrops) / $projects["raindrops"]["cost"]) * 100 : 0 ?>%"></div> + </div> + <?php $missing = $projects["cloudburst"]["cost"] - ($allAccounts - $minimumCloudburst); if ($missing > 0): $months = ceil($missing / getMonthlyEarnings()["cloudburst"]); ?> + <div>Costs £<?= number_format($projects["cloudburst"]["cost"], 2, '.', ',') ?> · Missing £<?= number_format($missing, 2, '.', ',') ?> · Can afford it in <?= date('F Y', time() + ($months * 2678400)) ?> (in <?= $months ?> month<?= $months > 1 ? "s" : "" ?>)</div> + <?php elseif ($missing === 0): ?><div>You can afford it now, this will take you to the minimum.</div> + <?php else: ?><div>You can afford it now, this will take you £<?= -$missing ?> above the minimum.</div><?php endif; ?> + </div> + </div> + </div> + <?php endif; ?> + <canvas id="history-cloudburst" style="margin-top: 10px; width: 100%; height: 200px; max-height: 100%;"></canvas> <?php |