From e97805d379d479f4b4c0a7feea75311c189ca364 Mon Sep 17 00:00:00 2001 From: Kumi Date: Sat, 10 Aug 2024 16:23:52 +0200 Subject: [PATCH] feat: add bidirectional XMR to fiat conversion Introduced bidirectional conversion functionality for XMR to fiat calculations. Added form elements and event listeners to handle user inputs and conversion direction. Enhanced URL and metadata processing to be dynamic based on protocol. Updated UI with conversion buttons for a better user experience. Safelisted new CSS classes in webpack configuration. --- index.php | 76 +++++++++++++++++++++++++++++++--------------- src/css/custom.css | 25 +++++++++++++++ src/js/main.js | 13 ++++++++ webpack.config.js | 2 +- 4 files changed, 90 insertions(+), 26 deletions(-) diff --git a/index.php b/index.php index 4e1e784..0bdd8b3 100644 --- a/index.php +++ b/index.php @@ -4,6 +4,10 @@ header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); +$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://"; +$currentUrl = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; +$parentUrl = dirname($currentUrl); + // Get currency data from JSON $api_cg = json_decode(file_get_contents('coingecko.json'), true); @@ -52,9 +56,22 @@ $lang = strtolower($lang); require_once "lang/{$lang}.php"; $xmr_in = isset($_GET["in"]) ? strtoupper(htmlspecialchars($_GET["in"])) : 'EUR'; -$xmr_in_fiat = number_format($exchangeRates[$xmr_in], $xmr_in == 'BTC' || $xmr_in == 'LTC' || $xmr_in == 'ETH' || $xmr_in == 'XAG' || $xmr_in == 'XAU' ? 8 : 2); +$xmr_amount = isset($_GET["xmr"]) ? floatval($_GET["xmr"]) : 1; +$fiat_amount = isset($_GET["fiat"]) ? floatval($_GET["fiat"]) : ''; +$conversion_direction = isset($_GET["direction"]) ? intval($_GET["direction"]) : 0; -$xmr_in_fiat = strtr($xmr_in_fiat, ",", " "); +if ($conversion_direction == 0) { + $fiat_value = $xmr_amount * $exchangeRates[$xmr_in]; + $xmr_value = $xmr_amount; +} else { + $xmr_value = $fiat_amount / $exchangeRates[$xmr_in]; + $fiat_value = $fiat_amount; +} + +$fiat_value = number_format($fiat_value, ($xmr_in == 'BTC' || $xmr_in == 'LTC' || $xmr_in == 'ETH' || $xmr_in == 'XAG' || $xmr_in == 'XAU') ? 8 : 2); +$xmr_value = number_format($xmr_value, 12); + +$fiat_value = strtr($fiat_value, ",", " "); // Order preferred currencies to the top foreach (array_reverse($preferred_currencies) as $currency) { @@ -81,7 +98,7 @@ foreach (array_reverse($preferred_currencies) as $currency) { - + @@ -143,29 +160,39 @@ foreach (array_reverse($preferred_currencies) as $currency) {
-
- - - -
+
+
+ + + +
-
- = -
+
+ + + +
-
- - - -
+
+ + + +
+
@@ -199,7 +226,6 @@ foreach (array_reverse($preferred_currencies) as $currency) { var exchangeRates = ; - \ No newline at end of file diff --git a/src/css/custom.css b/src/css/custom.css index 597f08d..6add851 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -53,6 +53,31 @@ input.form-control { font-size: 42px; } +.btn-arrow { + border: 1px solid white; + border-radius: 10px; + font-size: 38px !important; + color: white; + padding: 0; + cursor: pointer; +} + +.btn-arrow:hover { + border: 1px solid black; + color: black; +} + +.btn-equals { + font-size: 38px !important; + color: white; + padding: 0; + cursor: default; +} + +.btn-equals:hover { + color: black; +} + .equals-text { vertical-align: super; } diff --git a/src/js/main.js b/src/js/main.js index 63db4fb..a8eaf5a 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -20,6 +20,8 @@ document.addEventListener('DOMContentLoaded', function () { const xmrInput = document.getElementById('xmrInput'); const fiatInput = document.getElementById('fiatInput'); const selectBox = document.getElementById('selectBox'); + const convertXMRToFiatBtn = document.getElementById('convertXMRToFiat'); + const convertFiatToXMRBtn = document.getElementById('convertFiatToXMR'); // Add event listeners for the copy buttons copyXMRBtn.addEventListener('click', copyToClipBoardXMR); @@ -62,6 +64,17 @@ document.addEventListener('DOMContentLoaded', function () { } }); + // Add event listeners for the conversion buttons + convertXMRToFiatBtn.addEventListener('click', (e) => { + e.preventDefault(); + xmrConvert(); + }); + + convertFiatToXMRBtn.addEventListener('click', (e) => { + e.preventDefault(); + fiatConvert(); + }); + // Fetch updated exchange rates immediately, then every 5 seconds fetchUpdatedExchangeRates(); setInterval(fetchUpdatedExchangeRates, 5000); diff --git a/webpack.config.js b/webpack.config.js index 777896f..51ab45b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -31,7 +31,7 @@ module.exports = { paths: glob.sync([ path.join(__dirname, 'index.php') ]), - safelist: ['tooltip', 'fade', 'show', 'bs-tooltip-top', 'tooltip-inner', 'tooltip-arrow'] + safelist: ['tooltip', 'fade', 'show', 'bs-tooltip-top', 'tooltip-inner', 'tooltip-arrow', 'btn-equals', 'btn-arrow'] }) ] }; \ No newline at end of file