From 443e39e6cc6b90a38967e887f0248fc98e537fce Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Mon, 23 Jan 2023 14:13:49 +0100 Subject: [PATCH] More info to trade portal and auto buy --- qortal-ui-plugins/package.json | 1 + .../core/trade-bot/trade-bot-portal.src.js | 66 +++++++++++++++---- .../core/trade-portal/trade-portal.src.js | 50 +++++++++++++- 3 files changed, 103 insertions(+), 14 deletions(-) diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index 4ca2e7d1..a891f694 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -48,6 +48,7 @@ "@material/mwc-button": "0.27.0", "@material/mwc-checkbox": "0.27.0", "@material/mwc-dialog": "0.27.0", + "@material/mwc-fab": "0.27.0", "@material/mwc-formfield": "0.27.0", "@material/mwc-icon": "0.27.0", "@material/mwc-icon-button": "0.27.0", diff --git a/qortal-ui-plugins/plugins/core/trade-bot/trade-bot-portal.src.js b/qortal-ui-plugins/plugins/core/trade-bot/trade-bot-portal.src.js index 0bf6262a..f309bd76 100644 --- a/qortal-ui-plugins/plugins/core/trade-bot/trade-bot-portal.src.js +++ b/qortal-ui-plugins/plugins/core/trade-bot/trade-bot-portal.src.js @@ -12,11 +12,13 @@ import '@material/mwc-textfield' import '@material/mwc-icon' import '@material/mwc-icon-button' import '@material/mwc-dialog' +import '@material/mwc-fab' import '@material/mwc-tab-bar' import '@material/mwc-tab' import '@material/mwc-list/mwc-list-item' import '@material/mwc-select' import '@polymer/iron-icons/iron-icons.js' +import '@polymer/paper-dialog/paper-dialog.js' import '@polymer/paper-icon-button/paper-icon-button.js' import '@polymer/paper-spinner/paper-spinner-lite.js' import '@vaadin/grid' @@ -542,12 +544,37 @@ class TradeBotPortal extends LitElement { opacity: 0; } } + paper-dialog.info { + width: 75%; + max-width: 75vw; + height: 50%; + max-height: 50vh; + background-color: var(--white); + color: var(--black); + border: 1px solid var(--black); + border-radius: 15px; + line-height: 1.6; + overflow-y: auto; + } + .actions { + display:flex; + justify-content: space-between; + padding: 0 1em; + margin: 12px 0 -6px 0; + } + .close-icon { + font-size: 36px; + } + .close-icon:hover { + cursor: pointer; + opacity: .6; + } @media (min-width: 701px) { * { } #trade-bot-portal { display: grid; - grid-template-columns:3fr 4fr 3fr; + grid-template-columns: 2fr 4fr 2fr; grid-auto-rows: max(80px); column-gap: 0.5em; row-gap: 0.4em; @@ -557,7 +584,7 @@ class TradeBotPortal extends LitElement { } #first-trade-section { display: grid; - grid-template-columns:1fr 4fr 1fr; + grid-template-columns: 1fr 4fr 1fr; grid-auto-rows: max(250px); column-gap: 0.5em; row-gap: 0.4em; @@ -567,7 +594,7 @@ class TradeBotPortal extends LitElement { } #second-trade-section { display: grid; - grid-template-columns:1fr 4fr 1fr; + grid-template-columns: 1fr 4fr 1fr; grid-auto-rows: max(250px); column-gap: 0.5em; row-gap: 0.4em; @@ -860,7 +887,7 @@ class TradeBotPortal extends LitElement { return html`
-
${translate("tradepage.tchange36")}
+
${translate("info.inf15")}
${translate("login.loading")}
@@ -1037,7 +1064,7 @@ class TradeBotPortal extends LitElement { return html`
-
${translate("tradepage.tchange39")} ${this.listedCoins.get(this.selectedCoin).coinCode} ==> QORT
+
${translate("info.inf16")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode}
-
${translate("tradepage.tchange39")} ${this.listedCoins.get(this.selectedCoin).coinCode} ==> QORT
+
${translate("info.inf16")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode}
-
${translate("tradepage.tchange39")} ${this.listedCoins.get(this.selectedCoin).coinCode} ==> QORT
+
${translate("info.inf16")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode}
-
${translate("tradepage.tchange39")} ${this.listedCoins.get(this.selectedCoin).coinCode} ==> QORT
+
${translate("info.inf16")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode}
-
${translate("tradepage.tchange39")} ${this.listedCoins.get(this.selectedCoin).coinCode} ==> QORT
+
${translate("info.inf16")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode}
-
${translate("tradepage.tchange39")} ${this.listedCoins.get(this.selectedCoin).coinCode} ==> QORT
+
${translate("info.inf16")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode}
-

${translate("tradepage.tchange39")} -  

+

${translate("info.inf13")} QORT ${translate("info.inf14")} ${this.listedCoins.get(this.selectedCoin).coinCode} -  

BTC / QORT LTC / QORT @@ -1444,6 +1471,9 @@ class TradeBotPortal extends LitElement { RVN / QORT ARRR / QORT +
+ this.shadowRoot.getElementById('buyInfoDialog').open()}> +
@@ -1924,6 +1954,20 @@ class TradeBotPortal extends LitElement {
${translate("general.close")} + + +
+

+ this.shadowRoot.getElementById('buyInfoDialog').close()} title="${translate("info.inf8")}">highlight_off +
+
+

${translate("info.inf7")}

+

${translate("info.inf9")}

+

${translate("info.inf10")}

+

${translate("info.inf11")}

+

${translate("info.inf12")}

+
+ ` } diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js index bcfd5130..c629186a 100644 --- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js +++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js @@ -12,11 +12,13 @@ import '@material/mwc-textfield' import '@material/mwc-icon' import '@material/mwc-icon-button' import '@material/mwc-dialog' +import '@material/mwc-fab' import '@material/mwc-tab-bar' import '@material/mwc-tab' import '@material/mwc-list/mwc-list-item' import '@material/mwc-select' import '@polymer/iron-icons/iron-icons.js' +import '@polymer/paper-dialog/paper-dialog.js' import '@polymer/paper-icon-button/paper-icon-button.js' import '@polymer/paper-spinner/paper-spinner-lite.js' import '@vaadin/grid' @@ -549,6 +551,31 @@ class TradePortal extends LitElement { opacity: 0; } } + paper-dialog.info { + width: 75%; + max-width: 75vw; + height: 35%; + max-height: 35vh; + background-color: var(--white); + color: var(--black); + border: 1px solid var(--black); + border-radius: 15px; + line-height: 1.6; + overflow-y: auto; + } + .actions { + display: flex; + justify-content: space-between; + padding: 0 1em; + margin: 12px 0 -6px 0; + } + .close-icon { + font-size: 36px; + } + .close-icon:hover { + cursor: pointer; + opacity: .6; + } @media (min-width: 701px) { * { } @@ -887,8 +914,8 @@ class TradePortal extends LitElement {
- - + +
@@ -1168,9 +1195,13 @@ class TradePortal extends LitElement { QORT / RVN QORT / ARRR -
+
+ this.shadowRoot.getElementById('tradeInfoDialog').open()}> +
+
${this.chartShowCoin()}
+
@@ -1221,6 +1252,19 @@ class TradePortal extends LitElement {
${translate("general.close")} + + +
+

+ this.shadowRoot.getElementById('tradeInfoDialog').close()} title="${translate("info.inf2")}">highlight_off +
+
+

${translate("info.inf1")}

+

${translate("info.inf3")} ${this.listedCoins.get(this.selectedCoin).coinCode} ${translate("info.inf4")}

+

${translate("info.inf5")} ${this.listedCoins.get(this.selectedCoin).coinCode}

+

${translate("info.inf6")}

+
+ ` }