Merge pull request #1 from Qortal/master

updating repo
2 years ago · 1c130798ca
18 changed files with 64 additions and 71 deletions
--- a/qortal-ui-core/language/de.json
+++ b/qortal-ui-core/language/de.json
@ -714,6 +714,7 @@
      "exp17":"ALLE ZAHLUNGEN",
      "exp18":"Zahlungen",
      "exp19":"Gesendet",
-      "exp20":"Empfangen"
+      "exp20":"Empfangen",
+	  "exp21":"Trades"
   }
 }
--- a/qortal-ui-core/language/es.json
+++ b/qortal-ui-core/language/es.json
@ -714,6 +714,7 @@
      "exp17":"TODOS LOS PAGOS",
      "exp18":"Pagos",
      "exp19":"Enviado",
-      "exp20":"Recibido"
+      "exp20":"Recibido",
+	  "exp21":"Oficios"
   }
-}
+}
--- a/qortal-ui-core/language/fr.json
+++ b/qortal-ui-core/language/fr.json
@ -714,6 +714,7 @@
      "exp17":"TOUS LES PAIEMENTS",
      "exp18":"Paiements",
      "exp19":"Envoyé",
-      "exp20":"Reçu"
+      "exp20":"Reçu",
+	  "exp21":"Métiers"
   }
-}
+}
--- a/qortal-ui-core/language/hindi.json
+++ b/qortal-ui-core/language/hindi.json
@ -715,6 +715,7 @@
      "exp17":"सभी भुगतान",
      "exp18":"भुगतान",
      "exp19":"भेजा गया",
-      "exp20":"प्राप्त"
+      "exp20":"प्राप्त",
+	  "exp21":"ट्रेडों"
   }
-}
+}
--- a/qortal-ui-core/language/hr.json
+++ b/qortal-ui-core/language/hr.json
@ -715,6 +715,7 @@
      "exp17":"SVA PLAĆANJA",
      "exp18":"Plaćanja",
      "exp19":"Poslano",
-      "exp20":"Primljeno"
+      "exp20":"Primljeno",
+	  "exp21":"Obrta",
   }
-}
+}
--- a/qortal-ui-core/language/hu.json
+++ b/qortal-ui-core/language/hu.json
@ -714,6 +714,7 @@
      "exp17":"MINDEN FIZETÉS",
      "exp18":"Kifizetések",
      "exp19":"Elküldve",
-      "exp20":"Fogadott"
+      "exp20":"Fogadott",
+	  "exp21":"Passzátszelek"
   }
-}
+}
--- a/qortal-ui-core/language/it.json
+++ b/qortal-ui-core/language/it.json
@ -714,6 +714,7 @@
      "exp17":"TUTTI I PAGAMENTI",
      "exp18":"Pagamenti",
      "exp19":"Inviato",
-      "exp20":"Ricevuto"
+      "exp20":"Ricevuto",
+	  "exp21":"Mestieri"
   }
-}
+}
--- a/qortal-ui-core/language/ko.json
+++ b/qortal-ui-core/language/ko.json
@ -714,6 +714,7 @@
      "exp17":"모든 결제",
      "exp18":"결제",
      "exp19":"보냈습니다",
-      "exp20":"수신됨"
+      "exp20":"수신됨",
+	  "exp21":"거래"
   }
-}
+}
--- a/qortal-ui-core/language/no.json
+++ b/qortal-ui-core/language/no.json
@ -714,6 +714,7 @@
      "exp17":"ALLE BETALINGER",
      "exp18":"Betalinger",
      "exp19":"Sendt",
-      "exp20":"Motta"
+      "exp20":"Motta",
+	  "exp21":"Handler"
   }
-}
+}
--- a/qortal-ui-core/language/pl.json
+++ b/qortal-ui-core/language/pl.json
@ -714,6 +714,7 @@
      "exp17":"WSZYSTKIE PŁATNOŚCI",
      "exp18":"Płatności",
      "exp19":"Wysłane",
-      "exp20":"Otrzymano"
+      "exp20":"Otrzymano",
+	  "exp21":"Transakcji"
   }
-}
+}
--- a/qortal-ui-core/language/pt.json
+++ b/qortal-ui-core/language/pt.json
@ -714,6 +714,7 @@
      "exp17":"TODOS OS PAGAMENTOS",
      "exp18":"Pagamentos",
      "exp19":"Enviado",
-      "exp20":"Recebido"
+      "exp20":"Recebido",
+	  "exp21":"Comércios"
   }
-}
+}
--- a/qortal-ui-core/language/ro.json
+++ b/qortal-ui-core/language/ro.json
@ -714,6 +714,7 @@
      "exp17":"TOATE PLĂTILE",
      "exp18":"Plăti",
      "exp19":"Trimis",
-      "exp20":"Primit"
+      "exp20":"Primit",
+	  "exp21":"Meserii"
   }
-}
+}
--- a/qortal-ui-core/language/rs.json
+++ b/qortal-ui-core/language/rs.json
@ -714,6 +714,7 @@
      "exp17": "SVA PLAĆANJA",
      "exp18":"Plaćanja",
      "exp19":"Poslato",
-      "exp20":"Primljeno"
+      "exp20":"Primljeno",
+	  "exp21":"Trgovine"
   }
-}
+}
--- a/qortal-ui-core/language/ru.json
+++ b/qortal-ui-core/language/ru.json
@ -714,6 +714,7 @@
      "exp17":"ВСЕ ПЛАТЕЖИ",
      "exp18":"Платежи",
      "exp19":"Отправлено",
-      "exp20":"Получено"
+      "exp20":"Получено",
+	  "exp21":"Сделок"
   }
-}
+}
--- a/qortal-ui-core/language/us.json
+++ b/qortal-ui-core/language/us.json
@ -714,6 +714,7 @@
      "exp17":"ALL PAYMENTS",
      "exp18":"Payments",
      "exp19":"Sent",
-      "exp20":"Received"
+      "exp20":"Received",
+      "exp21":"Trades"
   }
 }
--- a/qortal-ui-core/language/zhc.json
+++ b/qortal-ui-core/language/zhc.json
@ -714,6 +714,7 @@
      "exp17":"所有付款",
      "exp18":"付款",
      "exp19":"已发送",
-      "exp20":"收到"
+      "exp20":"收到",
+	  "exp21":"行业"
   }
-}
+}
--- a/qortal-ui-core/language/zht.json
+++ b/qortal-ui-core/language/zht.json
@ -714,6 +714,7 @@
      "exp17":"所有付款",
      "exp18":"付款",
      "exp19":"已發送",
-      "exp20":"收到"
+      "exp20":"收到",
+	  "exp21":"行業"
   }
-}
+}
--- a/qortal-ui-core/src/components/user-info-view/user-info-view.js
+++ b/qortal-ui-core/src/components/user-info-view/user-info-view.js
@ -1063,21 +1063,6 @@ class UserInfoView extends connect(store)(LitElement) {

    render() {
        return html`
-            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px;" id="userInfoDialog" modal>
-                <div class="card-container">
-                    <span class="level">${translate("mintingpage.mchange27")} ${this.displayLevel}</span>
-                    ${this.founderBadge()}
-                    ${this.avatarImage()}
-                    <h2>${this.infoAccountName}</h2>
-                    <h4>${this.displayAddress}</h4>
-                    <p>${translate("explorerpage.exp2")}: ${this.displayBalance} QORT</p>
-                </div>
-                <div class="buttons">
-                    <mwc-button @click=${() => this.openMoreInfoDialog()}>${translate("explorerpage.exp3")}</mwc-button>
-                    <mwc-button class='decline' @click=${() => this.closeInfoDialog()} dialog-dismiss>${translate("general.close")}</mwc-button>
-                </div>
-            </paper-dialog>
-
            <paper-dialog class="full-info-wrapper" id="userFullInfoDialog" modal>
                <div class="full-info-logo">${this.avatarFullImage()}</div>
                <h3>${this.infoAccountName}</h3>
@ -1162,6 +1147,7 @@ class UserInfoView extends connect(store)(LitElement) {
                    </div>
                </div>
                <div class="buttons">
+                    <mwc-button @click=${() => this.openTrades()}>${translate("explorerpage.exp21")}</mwc-button>
                    <mwc-button class='decline' @click=${() => this.closeCompleteInfoDialog()} dialog-dismiss>${translate("general.close")}</mwc-button>
                </div>
            </paper-dialog>
@ -1177,18 +1163,17 @@ class UserInfoView extends connect(store)(LitElement) {
                </div>
            </paper-dialog>

-            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px;" id="userMoreInfoDialog" modal>
+            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px;" id="userTrades" modal>
                <div class="card-container-button">
-                    <mwc-button dense unelevated label="${translate("explorerpage.exp14")}" @click=${() => this.openCompleteInfoDialog()}></mwc-button><br><br>
                    <mwc-button dense unelevated label="${translate("explorerpage.exp8")}" @click=${() => this.openUserBoughtDialog()}></mwc-button><br><br>
                    <mwc-button dense unelevated label="${translate("explorerpage.exp9")}" @click=${() => this.openUserSoldDialog()}></mwc-button><br><br>
                </div>
                <div class="buttons">
-                    <mwc-button class='decline' @click=${() => this.closeMoreInfoDialog()} dialog-dismiss>${translate("general.close")}</mwc-button>
+                    <mwc-button class='decline' @click=${() => this.closeTrades()} dialog-dismiss>${translate("general.close")}</mwc-button>
                </div>
            </paper-dialog>

-            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px;" id="userBoughtDialog" modal>
+            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px;" id="userBoughtDialog" entry-animation="scale-up-animation" exit-animation="fade-out-animation" with-backdrop>
                <div class="card-explorer-container">
                    <div id="first-explorer-section">
                        ${this.boughtBTCTemplate()}
@ -1208,7 +1193,7 @@ class UserInfoView extends connect(store)(LitElement) {
                </div>
            </paper-dialog>

-            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px; overflow: auto;" id="userSoldDialog" modal>
+            <paper-dialog style="background: var(--white); border: 1px solid var(--black); border-radius: 5px; overflow: auto;" id="userSoldDialog" entry-animation="scale-up-animation" exit-animation="fade-out-animation" with-backdrop>
                <div class="card-explorer-container">
                    <div id="first-explorer-section">
                        ${this.soldBTCTemplate()}
@ -1328,7 +1313,11 @@ class UserInfoView extends connect(store)(LitElement) {
        await this.getAddressUserBalance(myAddress)
        this.displayAddress = this.addressResult.address
        this.displayLevel = this.addressResult.level
-        this.shadowRoot.getElementById('userInfoDialog').open()
+        this.isLoadingCompleteInfo = true
+        this.shadowRoot.getElementById('userFullInfoDialog').open()
+        await this.getStartMint()
+        await this.getPaymentsGridItems()
+        this.isLoadingCompleteInfo = false
    }

    async getAddressUserInfo(infoAddress) {
@ -1782,20 +1771,11 @@ class UserInfoView extends connect(store)(LitElement) {
        }).filter(item => !!item)
    }

-    openMoreInfoDialog() {
-        this.shadowRoot.getElementById('userMoreInfoDialog').open()
+    openTrades() {
+        this.shadowRoot.getElementById('userTrades').open()
        this.shadowRoot.getElementById('userInfoDialog').close()
    }

-    async openCompleteInfoDialog() {
-        this.isLoadingCompleteInfo = true
-        this.shadowRoot.getElementById('userFullInfoDialog').open()
-        this.shadowRoot.getElementById('userMoreInfoDialog').close()
-        await this.getStartMint()
-        await this.getPaymentsGridItems()
-        this.isLoadingCompleteInfo = false
-    }
-
    async openUserBoughtDialog() {
        this.shadowRoot.getElementById('userBoughtDialog').open()
        this.explorerBoughtBTCTrades = []
@ -1852,16 +1832,12 @@ class UserInfoView extends connect(store)(LitElement) {
        this.isLoadingSoldTradesARRR = false
    }

-    closeInfoDialog() {
-        this.shadowRoot.getElementById('userInfoDialog').close()
-    }
-
    closeErrorDialog() {
        this.shadowRoot.getElementById('userErrorDialog').close()
    }

-    closeMoreInfoDialog() {
-        this.shadowRoot.getElementById('userMoreInfoDialog').close()
+    closeTrades() {
+        this.shadowRoot.getElementById('userTrades').close()
    }

    closeCompleteInfoDialog() {
@ -1895,4 +1871,4 @@ class UserInfoView extends connect(store)(LitElement) {
    }
 }

-window.customElements.define('user-info-view', UserInfoView)
+window.customElements.define('user-info-view', UserInfoView)