${this.boughtBTCTemplate()}
@@ -1193,7 +1191,7 @@ class UserInfoView extends connect(store)(LitElement) {
-
${this.soldBTCTemplate()}
@@ -1213,7 +1211,7 @@ class UserInfoView extends connect(store)(LitElement) {
- ${translate("walletpage.wchange5")}
@@ -1773,7 +1771,7 @@ class UserInfoView extends connect(store)(LitElement) { openTrades() { this.shadowRoot.getElementById('userTrades').open() - this.shadowRoot.getElementById('userInfoDialog').close() + this.shadowRoot.getElementById('userFullInfoDialog').close() } async openUserBoughtDialog() { From 811957d900684f13853c766b216a398745c47a28 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:06:57 +0100 Subject: [PATCH 05/14] Add join requests actions --- qortal-ui-core/language/de.json | 11 +- qortal-ui-core/language/es.json | 11 +- qortal-ui-core/language/fr.json | 11 +- qortal-ui-core/language/hindi.json | 13 +- qortal-ui-core/language/hr.json | 13 +- qortal-ui-core/language/hu.json | 11 +- qortal-ui-core/language/it.json | 11 +- qortal-ui-core/language/ko.json | 11 +- qortal-ui-core/language/no.json | 11 +- qortal-ui-core/language/pl.json | 13 +- qortal-ui-core/language/pt.json | 11 +- qortal-ui-core/language/ro.json | 11 +- qortal-ui-core/language/rs.json | 11 +- qortal-ui-core/language/ru.json | 11 +- qortal-ui-core/language/us.json | 11 +- qortal-ui-core/language/zhc.json | 11 +- qortal-ui-core/language/zht.json | 11 +- .../group-management/group-management.src.js | 348 ++++++++++++++++++ 18 files changed, 521 insertions(+), 20 deletions(-) diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index e197a97e..f10ddfe7 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -799,6 +799,15 @@ "mg49":"Beim Drücken auf Bestätigen wird die Anfrage zum Abbrechen der Einladung gesendet!", "mg50":"Kommt bald...", "mg51":"Minimum 3 Zeichen / Maximum 32 Zeichen", - "mg52":"Maximal 128 Zeichen" + "mg52":"Maximal 128 Zeichen", + "mg53":"Ihre offenen Beitrittsanfragen", + "mg54":"Keine offenen Beitrittsanfragen", + "mg55":"Sind Sie sicher, dass Sie die Beitrittsanfrage von diesem Mitglied annehmen werden?", + "mg56":"Beim Drücken von Bestätigen wird die Beitrittsanfrage gesendet!", + "mg57":"Beitrittsanfrage erfolgreich angenommen", + "mg58":"ETWAS GING FALSCH", + "mg59":"Beitrittsanfrage abbrechen erfolgreich akzeptiert", + "mg60":"Sind Sie sicher, dass Sie die Beitrittsanfrage dieses Mitglieds abbrechen möchten?", + "mg61":"Beim Drücken auf Bestätigen wird die Anfrage zum Abbrechen des Beitritts gesendet!" } } diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json index 0312fa3f..4ae55367 100644 --- a/qortal-ui-core/language/es.json +++ b/qortal-ui-core/language/es.json @@ -799,6 +799,15 @@ "mg49":"¡Al presionar confirmar, se enviará la solicitud de cancelación de invitación!", "mg50":"Próximamente...", "mg51":"Mínimo 3 Caracteres / Máximo 32 Caracteres", - "mg52":"Máximo de 128 caracteres" + "mg52":"Máximo de 128 caracteres", + "mg53":"Tus solicitudes abiertas de unión", + "mg54":"Sin solicitudes de unión abiertas", + "mg55":"¿Está seguro de aceptar la solicitud de ingreso de este miembro?", + "mg56":"¡Al presionar confirmar, se enviará la solicitud de aceptación de ingreso!", + "mg57":"Solicitud de ingreso aceptada con éxito", + "mg58":"ALGO SALIO MAL", + "mg59":"Solicitud de cancelación de unión aceptada con éxito", + "mg60":"¿Está seguro de cancelar la solicitud de ingreso de este miembro?", + "mg61":"¡Al presionar confirmar, se enviará la solicitud de cancelación de unión!" } } diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index d677edd0..03b21617 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -799,6 +799,15 @@ "mg49":"En appuyant sur confirmer, la demande d'annulation d'invitation sera envoyée !", "mg50":"Bientôt disponible...", "mg51":"Minimum 3 caractères / Maximum 32 caractères", - "mg52":"Maximum 128 caractères" + "mg52":"Maximum 128 caractères", + "mg53":"Vos demandes d'ouverture de jointure", + "mg54":"Aucune demande de jointure ouverte", + "mg55":"Êtes-vous sûr d'accepter la demande d'adhésion de ce membre ?", + "mg56":"En appuyant sur confirmer, la demande d'adhésion acceptée sera envoyée !", + "mg57":"Demande d'adhésion acceptée avec succès", + "mg58":"QUELQUE CHOSE S'EST TROMPÉ", + "mg59":"Annuler la demande d'adhésion acceptée avec succès", + "mg60":"Êtes-vous sûr d'annuler la demande d'adhésion de ce membre ?", + "mg61":"En appuyant sur confirmer, la demande d'annulation de l'adhésion sera envoyée !" } } diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json index a35856f4..02479e0f 100644 --- a/qortal-ui-core/language/hindi.json +++ b/qortal-ui-core/language/hindi.json @@ -799,7 +799,16 @@ "mg48":"क्या आप वाकई इस सदस्य के लिए आमंत्रण रद्द करना चाहते हैं?", "mg49":"पुष्टि करें दबाने पर, रद्द आमंत्रण अनुरोध भेजा जाएगा!", "mg50":"जल्द ही आ रहा है ...", - "mg51": "न्यूनतम 3 वर्ण / अधिकतम 32 वर्ण", - "mg52": "अधिकतम 128 वर्ण" + "mg51":"न्यूनतम 3 वर्ण / अधिकतम 32 वर्ण", + "mg52":"अधिकतम 128 वर्ण", + "mg53":"आपका खुला शामिल होने का अनुरोध", + "mg54":"नो ओपन जॉइन रिक्वेस्ट", + "mg55":"क्या आप निश्चित रूप से इस सदस्य के शामिल होने के अनुरोध को स्वीकार करना चाहते हैं?", + "mg56":"पुष्टि करें दबाने पर, स्वीकार करने का अनुरोध भेजा जाएगा!", + "mg57":"जुड़ने का अनुरोध सफलतापूर्वक स्वीकार किया गया", + "mg58":"कुछ गलत हो गया", + "mg59":"रद्द करें शामिल होने का अनुरोध सफलतापूर्वक स्वीकार किया गया", + "mg60":"क्या आप निश्चित रूप से इस सदस्य के शामिल होने के अनुरोध को रद्द करना चाहते हैं?", + "mg61":"पुष्टि करें दबाने पर, रद्द करने का अनुरोध भेजा जाएगा!" } } diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json index 8478c342..dc066af8 100644 --- a/qortal-ui-core/language/hr.json +++ b/qortal-ui-core/language/hr.json @@ -798,7 +798,16 @@ "mg48":"Jeste li sigurni da želite otkazati poziv za ovog člana?", "mg49":"Pritiskom na potvrdu, zahtjev za pozivnicu za otkazivanje bit će poslan!", "mg50":"Uskoro...", - "mg51": "Minimalno 3 znaka / Maksimalno 32 znaka", - "mg52": "Maksimalno 128 znakova" + "mg51":"Minimalno 3 znaka / Maksimalno 32 znaka", + "mg52":"Maksimalno 128 znakova", + "mg53":"Vaši otvoreni zahtjevi za pridruživanje", + "mg54":"Nema otvorenih zahtjeva za pridruživanje", + "mg55":"Jeste li sigurni da prihvaćate zahtjev za pridruživanje ovog člana?", + "mg56":"Pritiskom na potvrdu, zahtjev za prihvaćanje pridruživanja bit će poslan!", + "mg57":"Zahtjev za pridruživanje uspješno prihvaćen", + "mg58":"NEŠTO JE POŠLO PO ZLOU", + "mg59":"Poništi zahtjev za pridruživanje uspješno prihvaćen", + "mg60":"Jeste li sigurni da želite otkazati zahtjev za pridruživanje ovog člana?", + "mg61":"Pritiskom na potvrdu, bit će poslan zahtjev za otkazivanje pridruživanja!" } } diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json index 6fdc4f54..76f9fed4 100644 --- a/qortal-ui-core/language/hu.json +++ b/qortal-ui-core/language/hu.json @@ -799,6 +799,15 @@ "mg49":"A megerősítés megnyomására a rendszer elküldi a meghívó visszavonási kérelmét!", "mg50":"Hamarosan...", "mg51":"Minimum 3 karakter / legfeljebb 32 karakter", - "mg52":"Legfeljebb 128 karakter" + "mg52":"Legfeljebb 128 karakter", + "mg53":"Az Ön nyitott csatlakozási kérelmei", + "mg54":"Nincsenek nyitott csatlakozási kérelmek", + "mg55":"Biztosan elfogadja ennek a tagnak a csatlakozási kérelmét?", + "mg56":"A megerősítés megnyomására a rendszer elküldi az elfogadási csatlakozási kérelmet!", + "mg57":"Csatlakozási kérelem sikeresen elfogadva", + "mg58":"VALAMI RÁMADT", + "mg59":"Csatlakozási kérelem visszavonása sikeresen elfogadva", + "mg60":"Biztosan visszavonja ennek a tagnak a csatlakozási kérelmét?", + "mg61":"A megerősítés megnyomására a csatlakozás megszakítási kérelme elküldésre kerül!" } } diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json index 7cea8646..42e55e2e 100644 --- a/qortal-ui-core/language/it.json +++ b/qortal-ui-core/language/it.json @@ -799,6 +799,15 @@ "mg49":"Premendo conferma, verrà inviata la richiesta di annullamento dell'invito!", "mg50":"Prossimamente...", "mg51":"Minimo 3 caratteri / Massimo 32 caratteri", - "mg52":"Massimo 128 caratteri" + "mg52":"Massimo 128 caratteri", + "mg53":"Le tue richieste di partecipazione aperte", + "mg54":"Nessuna richiesta di partecipazione aperta", + "mg55":"Sei sicuro di accettare la richiesta di adesione di questo membro ?", + "mg56":"Premendo conferma, verrà inviata la richiesta di partecipazione accettata!", + "mg57":"Richiesta di partecipazione accettata con successo", + "mg58":"QUALCOSA È ANDATO storto", + "mg59":"Annulla richiesta di partecipazione accettata con successo", + "mg60":"Sei sicuro di voler annullare la richiesta di adesione di questo membro ?", + "mg61":"Premendo conferma, verrà inviata la richiesta di annullamento partecipazione!" } } diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json index edd76c68..2124eec4 100644 --- a/qortal-ui-core/language/ko.json +++ b/qortal-ui-core/language/ko.json @@ -799,6 +799,15 @@ "mg49":"확인을 누르면 초대 취소 요청이 전송됩니다!", "mg50":"출시 예정...", "mg51":"최소 3자 / 최대 32자", - "mg52":"최대 128자" + "mg52":"최대 128자", + "mg53":"귀하의 오픈 조인 요청", + "mg54":"오픈 조인 요청 없음", + "mg55":"이 회원의 가입 요청을 수락하시겠습니까?", + "mg56":"확인을 누르면 가입 수락 요청이 전송됩니다!", + "mg57":"가입 요청이 성공적으로 수락됨", + "mg58":"뭔가 잘못되었습니다", + "mg59":"가입 요청 취소 성공", + "mg60":"이 회원의 가입 요청을 취소하시겠습니까?", + "mg61":"확인을 누르면 가입 취소 요청이 전송됩니다!" } } diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json index 24e94b7d..a38abbe8 100644 --- a/qortal-ui-core/language/no.json +++ b/qortal-ui-core/language/no.json @@ -799,6 +799,15 @@ "mg49":"Når du trykker på bekreftelse, vil forespørselen om kansellering av invitasjon bli sendt!", "mg50":"Kommer snart...", "mg51":"Minimum 3 tegn / maksimum 32 tegn", - "mg52": "Maksimalt 128 tegn" + "mg52":"Maksimalt 128 tegn", + "mg53":"Dine åpne forespørsler om bli med", + "mg54":"Ingen åpne forespørsler om medlemskap", + "mg55":"Er du sikker på å godta forespørselen fra dette medlemmet?", + "mg56":"Når du trykker på bekreft, vil forespørselen om å godta bli sendt bli sendt!", + "mg57":"Bli med forespørsel ble godtatt", + "mg58":"NOE GIKK FEIL", + "mg59":"Avbryt deltakelsesforespørsel ble godtatt", + "mg60":"Er du sikker på å avbryte forespørselen om å bli medlem fra dette medlemmet?", + "mg61":"Når du trykker på bekreft, vil forespørselen om kansellering bli sendt!" } } diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index cd4f76c3..aff8fbd4 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -798,7 +798,16 @@ "mg48":"Czy na pewno chcesz anulować zaproszenie dla tego członka?", "mg49":"Po naciśnięciu potwierdzenia zostanie wysłana prośba o anulowanie zaproszenia!", "mg50":"Już wkrótce...", - "mg51": "Minimum 3 znaki / Maksymalnie 32 znaki", - "mg52": "Maksymalnie 128 znaków" + "mg51":"Minimum 3 znaki / Maksymalnie 32 znaki", + "mg52":"Maksymalnie 128 znaków", + "mg53":"Twoje otwarte prośby o dołączenie", + "mg54":"Brak otwartych próśb o dołączenie", + "mg55":"Czy na pewno akceptujesz prośbę o dołączenie od tego członka?", + "mg56":"Po naciśnięciu potwierdzenia zostanie wysłana prośba o zaakceptowanie dołączenia!", + "mg57":"Prośba o dołączenie pomyślnie zaakceptowana", + "mg58":"COŚ POszło nie tak", + "mg59":"Anuluj prośbę o dołączenie pomyślnie zaakceptowaną", + "mg60":"Czy na pewno chcesz anulować prośbę o dołączenie od tego członka?", + "mg61":"Po naciśnięciu potwierdzenia, zostanie wysłana prośba o anulowanie dołączenia!" } } diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json index bce9759d..035986c0 100644 --- a/qortal-ui-core/language/pt.json +++ b/qortal-ui-core/language/pt.json @@ -799,6 +799,15 @@ "mg49":"Ao pressionar confirmar, a solicitação de cancelamento do convite será enviada!", "mg50":"Em Breve...", "mg51":"Mínimo de 3 caracteres / Máximo de 32 caracteres", - "mg52":"Máximo de 128 caracteres" + "mg52":"Máximo de 128 caracteres", + "mg53":"Suas solicitações de entrada abertas", + "mg54":"Nenhuma solicitação de entrada aberta", + "mg55":"Tem certeza que aceita a solicitação de entrada deste membro?", + "mg56":"Ao pressionar confirmar, o pedido de aceitação de entrada será enviado!", + "mg57":"Solicitação de entrada aceita com sucesso", + "mg58":"ALGO DEU ERRADO", + "mg59":"Cancelar pedido de entrada aceito com sucesso", + "mg60":"Tem certeza que deseja cancelar a solicitação de ingresso deste membro ?", + "mg61":"Ao pressionar confirmar, o pedido de cancelamento de adesão será enviado!" } } diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json index 97861bf6..891a0be4 100644 --- a/qortal-ui-core/language/ro.json +++ b/qortal-ui-core/language/ro.json @@ -799,6 +799,15 @@ "mg49":"La apăsarea confirmării, cererea de anulare a invitației va fi trimisă!", "mg50":"În curând...", "mg51":"Minim 3 caractere / Maxim 32 de caractere", - "mg52":"Maximum 128 de caractere" + "mg52":"Maximum 128 de caractere", + "mg53":"Solicitările dvs. de înscriere deschise", + "mg54":"Fără solicitări de aderare deschise", + "mg55":"Sunteți sigur că acceptați solicitarea de alăturare de la acest membru?", + "mg56":"La apăsarea confirmării, va fi trimisă cererea de acceptare a înscrierii!", + "mg57":"Solicitarea de înscriere a fost acceptată cu succes", + "mg58":"CEVA A MERAT GREUT", + "mg59":"Anularea cererii de aderare a fost acceptată cu succes", + "mg60":"Sigur anulați solicitarea de alăturare de la acest membru?", + "mg61":"La apăsarea confirmării, cererea de anulare a aderării va fi trimisă!" } } diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json index 0670c642..432280f7 100644 --- a/qortal-ui-core/language/rs.json +++ b/qortal-ui-core/language/rs.json @@ -799,6 +799,15 @@ "mg49":"Pritiskom na potvrdi, zahtev za otkazivanje pozivnice će biti poslat!", "mg50":"Uskoro...", "mg51":"Najmanje 3 znaka / maksimalno 32 znaka", - "mg52":"Maksimalno 128 znakova" + "mg52":"Maksimalno 128 znakova", + "mg53":"Vaši zahtevi za otvoreno pridruživanje", + "mg54":"Nema otvorenih zahteva za pridruživanje", + "mg55":"Da li ste sigurni da prihvatate zahtev za pridruživanje ovog člana?", + "mg56":"Pritiskom na potvrdi, biće poslat zahtev za prihvatanje pridruživanja!", + "mg57":"Zahtev za pridruživanje je uspešno prihvaćen", + "mg58":"NEŠTO JE POŠLO NA ZLO", + "mg59":"Zahtev za otkazivanje pridruživanja je uspešno prihvaćen", + "mg60":"Da li ste sigurni da otkažete zahtev za pridruživanje ovog člana?", + "mg61":"Pritiskom na potvrdu, zahtev za otkazivanje pridruživanja će biti poslat!" } } diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json index 1828a4af..e40c5ae3 100644 --- a/qortal-ui-core/language/ru.json +++ b/qortal-ui-core/language/ru.json @@ -799,6 +799,15 @@ "mg49":"При нажатии подтверждения будет отправлен запрос на отмену приглашения!", "mg50":"Скоро...", "mg51":"Минимум 3 символа / максимум 32 символа", - "mg52":"Максимум 128 символов" + "mg52":"Максимум 128 символов", + "mg53":"Ваши открытые запросы на вступление", + "mg54":"Открытых запросов на присоединение нет", + "mg55":"Вы уверены, что принимаете запрос на вступление от этого участника?", + "mg56":"При нажатии подтверждения будет отправлен запрос на присоединение!", + "mg57":"Запрос на присоединение успешно принят", + "mg58":"ЧТО-ТО ПОШЛО НЕ ТАК", + "mg59":"Запрос на отмену присоединения успешно принят", + "mg60":"Вы уверены, что отмените запрос на вступление от этого участника?", + "mg61":"При нажатии кнопки подтверждения будет отправлен запрос на отмену присоединения!" } } diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index c50aa9ec..7da41ef0 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -799,6 +799,15 @@ "mg49":"On pressing confirm, the cancel invite request will be sent!", "mg50":"Coming Soon...", "mg51":"Minimum 3 Characters / Maximum 32 Characters", - "mg52":"Maximum 128 Characters" + "mg52":"Maximum 128 Characters", + "mg53":"Your Open Join Requests", + "mg54":"No Open Join Requests", + "mg55":"Are you sure to accept the join request from this member ?", + "mg56":"On pressing confirm, the accept join request will be sent!", + "mg57":"Join Request Successfully Accepted", + "mg58":"SOMETHING WENT WRONG", + "mg59":"Cancel Join Request Successfully Accepted", + "mg60":"Are you sure to cancel the join request from this member ?", + "mg61":"On pressing confirm, the cancel join request will be sent!" } } diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index c034caf0..dfd1d98d 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -799,6 +799,15 @@ "mg49":"按下确认后，将发送取消邀请请求！", "mg50":"即将推出……", "mg51":"最少 3 个字符 / 最多 32 个字符", - "mg52":"最多 128 个字符" + "mg52":"最多 128 个字符", + "mg53":"您的公开加入请求", + "mg54":"没有开放的加入请求", + "mg55":"您确定接受该会员的加入请求吗？", + "mg56":"按下确认后，将发送接受加入请求！", + "mg57":"成功接受加入请求", + "mg58":"出了点问题", + "mg59":"取消加入请求已成功接受", + "mg60":"您确定要取消该会员的加入请求吗？", + "mg61":"按下确认后，将发送取消加入请求！" } } diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index 94e0c663..7572a9df 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -799,6 +799,15 @@ "mg49":"按下確認後，將發送取消邀請請求！", "mg50":"即將推出……", "mg51":"最少 3 個字符 / 最多 32 個字符", - "mg52":"最多 128 個字符" + "mg52":"最多 128 個字符", + "mg53":"您的公開加入請求", + "mg54":"沒有開放的加入請求", + "mg55":"您確定接受該會員的加入請求嗎？", + "mg56":"按下確認後，將發送接受加入請求！", + "mg57":"成功接受加入請求", + "mg58":"出了點問題", + "mg59":"取消加入請求已成功接受", + "mg60":"您確定要取消該會員的加入請求嗎？", + "mg61":"按下確認後，將發送取消加入請求！" } } diff --git a/qortal-ui-plugins/plugins/core/group-management/group-management.src.js b/qortal-ui-plugins/plugins/core/group-management/group-management.src.js index db52b313..14a0388b 100644 --- a/qortal-ui-plugins/plugins/core/group-management/group-management.src.js +++ b/qortal-ui-plugins/plugins/core/group-management/group-management.src.js @@ -38,6 +38,7 @@ class GroupManagement extends LitElement { newAdminsList: { type: Array }, newBannedList: { type: Array }, newGroupInvitesList: { type: Array }, + newGroupJoinsList: { type: Array }, recipientPublicKey: { type: String }, selectedAddress: { type: Object }, manageGroupObj: { type: Object }, @@ -155,6 +156,11 @@ class GroupManagement extends LitElement { color: red; } + .success-icon { + font-size: 48px; + color: #198754; + } + .close-icon { font-size: 36px; } @@ -436,6 +442,7 @@ class GroupManagement extends LitElement { this.newAdminsList = [] this.newBannedList = [] this.newGroupInvitesList = [] + this.newGroupJoinsList = [] this.manageGroupObj = {} this.joinGroupObj = {} this.leaveGroupObj = {} @@ -836,6 +843,7 @@ class GroupManagement extends LitElement { groupInviteTemplate() { return html` +
${translate("managegroup.mg36")}
+
${translate("managegroup.mg53")}
++
+ group_add
+
+
+ ${translate("managegroup.mg57")}
+${translate("walletpage.wchange43")}
+
+ warning
+
+
+ ${translate("managegroup.mg58")}
+${this.errorMessage}
+${translate("walletpage.wchange44")}
+
+ person_remove
+
+
+ ${translate("managegroup.mg59")}
+${translate("walletpage.wchange43")}
+
+ warning
+
+
+ ${translate("managegroup.mg58")}
+${this.errorMessage}
+${translate("walletpage.wchange44")}
+
+
+ 
+
+
+ ${translate("general.close")}
+
+
+ ${translate("settings.exp3")}
+
+
+
+ `
+ }
+
+ closeSavePkmDialog() {
+ this.shadowRoot.querySelector('#savePkmDialog').close()
+ }
+
+ checkForPmkDownload(wAddress, wPkm, wName, wShort) {
+ this.dWalletAddress = ''
+ this.dPrivateKey = ''
+ this.dCoinName = ''
+ this.dCoinShort = ''
+ this.dWalletAddress = wAddress
+ this.dPrivateKey = wPkm
+ this.dCoinName = wName
+ this.dCoinShort = wShort
+ this.shadowRoot.querySelector('#savePkmDialog').show()
+ }
+
+ async exportKey(cMasterKey, cName, cAddress) {
+ const myPrivateMasterKey = cMasterKey
+ const myCoinName = cName
+ const myCoinAddress = cAddress
+ const blob = new Blob([`${myPrivateMasterKey}`], { type: 'text/plain;charset=utf-8' })
+ FileSaver.saveAs(blob, `Private_Master_Key_${myCoinName}_${myCoinAddress}.txt`)
+ }
+
+ stateChanged(state) {
+ }
+}
+
+window.customElements.define('export-keys', ExportKeys)
diff --git a/qortal-ui-core/src/components/settings-view/user-settings.js b/qortal-ui-core/src/components/settings-view/user-settings.js
index 4d522f17..66a8c887 100644
--- a/qortal-ui-core/src/components/settings-view/user-settings.js
+++ b/qortal-ui-core/src/components/settings-view/user-settings.js
@@ -10,6 +10,7 @@ import './account-view.js'
import './security-view.js'
import './notifications-view.js'
import './qr-login-view.js'
+import './export-keys.js'
import { doLogout } from '../../redux/app/app-actions.js'
@@ -156,6 +157,7 @@ class UserSettings extends connect(store)(LitElement) {
font-size: 16px;
text-align: center;
min-height: 460px;
+ height: 60vh;
}
@media(max-width:700px) {
@@ -226,6 +228,7 @@ class UserSettings extends connect(store)(LitElement) {
+
+ + ${translate("settings.exp4")} +
+
+
+
+
+
+
+
+ 
${this.btcWALLET}
+
+ ${this.btcWALLET}+
this.checkForPmkDownload(this.btcWALLET, this.btcPMK, this.btcName, this.btcShort)} class="export-button"> ${translate("settings.exp2")}
+
+
+
+ 
${this.ltcWALLET}
+
+ ${this.ltcWALLET}+
this.checkForPmkDownload(this.ltcWALLET, this.ltcPMK, this.ltcName, this.ltcShort)} class="export-button"> ${translate("settings.exp2")}
+
+
+
+ 
${this.dogeWALLET}
+
+ ${this.dogeWALLET}+
this.checkForPmkDownload(this.dogeWALLET, this.dogePMK, this.dogeName, this.dogeShort)} class="export-button"> ${translate("settings.exp2")}
+
+
+
+ 
${this.dgbWALLET}
+
+ ${this.dgbWALLET}+
this.checkForPmkDownload(this.dgbWALLET, this.dgbPMK, this.dgbName, this.dgbShort)} class="export-button"> ${translate("settings.exp2")}
+
+
+
+ 
${this.rvnWALLET}
+
+ ${this.rvnWALLET}+
this.checkForPmkDownload(this.rvnWALLET, this.rvnPMK, this.rvnName, this.rvnShort)} class="export-button"> ${translate("settings.exp2")}
+
+ ${this.dCoinName} ${translate("settings.exp2")}
++
${translate("settings.address")}: ${this.dWalletAddress}
+- this.setSettingsView('info')} >${translate("settings.account")}
- this.setSettingsView('security')} >${translate("settings.security")} +
- this.setSettingsView('export')} >${translate("settings.exp1") }
- this.setSettingsView('qr-login')} >${translate("settings.qr_login_menu_item") }
- this.setSettingsView('notification')} >${translate("settings.notifications")}
${translate("walletpage.wchange5")}
@@ -1577,7 +1577,7 @@ class MultiWallet extends LitElement { -
@@ -2759,7 +2759,7 @@ class MultiWallet extends LitElement {
checkSelectedTextAndShowMenu()
})
- this.shadowRoot.getElementById('rvnAmountInput').addEventListener('contextmenu', (event) => {
+ this.shadowRoot.getElementById('rvnAmountInput').addEventListener('contextmenu', (event) => {
const getSelectedText = () => {
var text = ''
if (typeof window.getSelection != 'undefined') {
@@ -2809,7 +2809,7 @@ class MultiWallet extends LitElement {
checkSelectedTextAndShowMenu()
})
- this.shadowRoot.getElementById('arrrAmountInput').addEventListener('contextmenu', (event) => {
+ this.shadowRoot.getElementById('arrrAmountInput').addEventListener('contextmenu', (event) => {
const getSelectedText = () => {
var text = ''
if (typeof window.getSelection != 'undefined') {
@@ -4499,7 +4499,7 @@ class MultiWallet extends LitElement {
case 'ltc':
case 'doge':
case 'dgb':
- case 'rvn':
+ case 'rvn':
this.balanceString = this.renderFetchText()
const walletName = `${coin}Wallet`
parentEpml.request('apiCall', {
@@ -4844,9 +4844,9 @@ class MultiWallet extends LitElement {
render(this.renderDogeTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM)
} else if (this._selectedWallet === 'dgb') {
render(this.renderDgbTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM)
- } else if (this._selectedWallet === 'rvn') {
+ } else if (this._selectedWallet === 'rvn') {
render(this.renderRvnTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM)
- } else if (this._selectedWallet === 'arrr') {
+ } else if (this._selectedWallet === 'arrr') {
render(this.renderArrrTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM)
}
}
From 6e30bb0c69ae76398d1a1483015b522d0dc4473d Mon Sep 17 00:00:00 2001
From: QuickMythril
@@ -1504,8 +1504,8 @@ class TradePortal extends LitElement {
case 'DIGIBYTE':
_url = `/crosschain/dgb/walletbalance?apiKey=${this.getApiKey()}`
_body = window.parent.reduxStore.getState().app.selectedAddress.dgbWallet.derivedMasterPublicKey
- break
- case 'RAVENCOIN':
+ break
+ case 'RAVENCOIN':
_url = `/crosschain/rvn/walletbalance?apiKey=${this.getApiKey()}`
_body = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.derivedMasterPublicKey
break
@@ -2945,4 +2945,4 @@ class TradePortal extends LitElement {
}
}
-window.customElements.define('trade-portal', TradePortal)
\ No newline at end of file
+window.customElements.define('trade-portal', TradePortal)
From 5bb1570a35778c3a41f763709805091631841b27 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Mon, 9 Jan 2023 14:05:13 +0100
Subject: [PATCH 12/14] last child full visible
---
qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
index 193883ee..dc59b97f 100644
--- a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
+++ b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
@@ -122,7 +122,7 @@ class Chat extends LitElement {
box-shadow: 0 3px 5px rgba(0, 0, 0, .2);
}
.people-list ul {
- padding: 0;
+ padding: 0px 0px 60px 0px;
height: 85vh;
overflow-y: auto;
overflow-x: hidden;
From f8ceaa56c51eb376b539b29d6e7c15e9bae53558 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Mon, 9 Jan 2023 15:03:59 +0100
Subject: [PATCH 13/14] Add chart js files
---
.../core/trade-portal/charts/arrr-charts.js | 214 +++++++++++++++++
.../core/trade-portal/charts/btc-charts.js | 215 ++++++++++++++++++
.../core/trade-portal/charts/dgb-charts.js | 214 +++++++++++++++++
.../core/trade-portal/charts/doge-charts.js | 214 +++++++++++++++++
.../core/trade-portal/charts/ltc-charts.js | 214 +++++++++++++++++
.../core/trade-portal/charts/rvn-charts.js | 214 +++++++++++++++++
6 files changed, 1285 insertions(+)
create mode 100644 qortal-ui-plugins/plugins/core/trade-portal/charts/arrr-charts.js
create mode 100644 qortal-ui-plugins/plugins/core/trade-portal/charts/btc-charts.js
create mode 100644 qortal-ui-plugins/plugins/core/trade-portal/charts/dgb-charts.js
create mode 100644 qortal-ui-plugins/plugins/core/trade-portal/charts/doge-charts.js
create mode 100644 qortal-ui-plugins/plugins/core/trade-portal/charts/ltc-charts.js
create mode 100644 qortal-ui-plugins/plugins/core/trade-portal/charts/rvn-charts.js
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/charts/arrr-charts.js b/qortal-ui-plugins/plugins/core/trade-portal/charts/arrr-charts.js
new file mode 100644
index 00000000..561cd9df
--- /dev/null
+++ b/qortal-ui-plugins/plugins/core/trade-portal/charts/arrr-charts.js
@@ -0,0 +1,214 @@
+import { LitElement, html, css } from 'lit'
+import { render } from 'lit/html.js'
+import { Epml } from '../../../../epml.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+
+registerTranslateConfig({
+ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
+})
+
+import '@polymer/paper-dialog/paper-dialog.js'
+import * as Highcharts from 'highcharts'
+import Exporting from 'highcharts/modules/exporting'
+Exporting(Highcharts)
+import StockChart from 'highcharts/modules/stock'
+StockChart(Highcharts)
+import 'highcharts/highcharts-more.js'
+import 'highcharts/modules/accessibility.js'
+import 'highcharts/modules/boost.js'
+import 'highcharts/modules/data.js'
+import 'highcharts/modules/export-data.js'
+import 'highcharts/modules/offline-exporting.js'
+
+let arrrChartDialog
+
+const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+class ArrrCharts extends LitElement {
+ static get properties() {
+ return {
+ isLoadingTradesChart: { type: Boolean },
+ arrrTrades: { type: Array },
+ arrrPrice: { type: Array }
+ }
+ }
+
+ static get styles() {
+ return css`
+ .loadingContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ .trades-chart {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 15px;
+ }
+
+ .chart-container {
+ margin: auto;
+ color: var(--black);
+ text-align: center;
+ padding: 15px;
+ height: 30vh;
+ width: 80vw;
+ }
+
+ .chart-info-wrapper {
+ background: transparent;
+ height: 38vh;
+ width: 83vw;
+ overflow: auto;
+ }
+
+ .chart-loading-wrapper {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ }
+ `
+ }
+
+ constructor() {
+ super()
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
+ this.isLoadingTradesChart = false
+ this.arrrTrades = []
+ this.arrrPrice = []
+ }
+
+ render() {
+ return html`
+
+
+
+
+ `
+ }
+
+ async firstUpdated() {
+ this.changeTheme()
+ this.changeLanguage()
+
+ window.addEventListener('storage', () => {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+ const checkTheme = localStorage.getItem('qortalTheme')
+
+ use(checkLanguage)
+
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme)
+ })
+ }
+
+ async loadTradesChart() {
+ this.isLoadingTradesChart = true
+ this.shadowRoot.getElementById('loadChartDialog').open()
+ await this.getArrrTrades()
+ this.isLoadingTradesChart = false
+ this.shadowRoot.getElementById('loadChartDialog').close()
+ this.enableArrrStockPriceChart()
+ }
+
+ async getArrrTrades() {
+ let currentArrrTimestamp = Date.now()
+ const monthBackArrr = currentArrrTimestamp - 31556952000
+ await parentEpml.request("apiCall", { url: `/crosschain/trades?foreignBlockchain=PIRATECHAIN&minimumTimestamp=${monthBackArrr}&limit=0&reverse=false` }).then((res) => {
+ this.arrrTrades = res
+ })
+ this.arrrPrice = this.arrrTrades.map(item => {
+ const arrrSellPrice = this.round(parseFloat(item.foreignAmount) / parseFloat(item.qortAmount))
+ return [item.tradeTimestamp, parseFloat(arrrSellPrice)]
+ }).filter(item => !!item)
+ }
+
+ enableArrrStockPriceChart() {
+ const arrrStockPriceData = this.arrrPrice
+ const header = 'QORT / ARRR ' + get("tradepage.tchange49")
+ Highcharts.stockChart(this.shadowRoot.querySelector('#arrrStockPriceContainer'), {
+ accessibility: {
+ enabled: false
+ },
+ credits: {
+ enabled: false
+ },
+ rangeSelector: {
+ selected: 1,
+ labelStyle: {color: 'var(--black)'},
+ inputStyle: {color: '#03a9f4'}
+ },
+ chart: {
+ backgroundColor: 'transparent'
+ },
+ title: {
+ text: header,
+ style: {color: 'var(--black)'}
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ series: [{
+ name: 'QORT / ARRR',
+ data: arrrStockPriceData,
+ tooltip: {
+ valueDecimals: 8
+ }
+ }]
+ })
+ }
+
+ async open() {
+ await this.loadTradesChart()
+ this.shadowRoot.getElementById('arrrChartDialog').open()
+ }
+
+ changeTheme() {
+ const checkTheme = localStorage.getItem('qortalTheme')
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme);
+ }
+
+ changeLanguage() {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+
+ if (checkLanguage === null || checkLanguage.length === 0) {
+ localStorage.setItem('qortalLanguage', 'us')
+ use('us')
+ } else {
+ use(checkLanguage)
+ }
+ }
+
+ round(number) {
+ let result = (Math.round(parseFloat(number) * 1e8) / 1e8).toFixed(8)
+ return result
+ }
+}
+
+window.customElements.define('arrr-charts', ArrrCharts)
+
+const chartsarrr = document.createElement('arrr-charts')
+arrrChartDialog = document.body.appendChild(chartsarrr)
+
+export default arrrChartDialog
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/charts/btc-charts.js b/qortal-ui-plugins/plugins/core/trade-portal/charts/btc-charts.js
new file mode 100644
index 00000000..c31d272b
--- /dev/null
+++ b/qortal-ui-plugins/plugins/core/trade-portal/charts/btc-charts.js
@@ -0,0 +1,215 @@
+import { LitElement, html, css } from 'lit'
+import { render } from 'lit/html.js'
+import { Epml } from '../../../../epml.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+
+registerTranslateConfig({
+ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
+})
+
+import '@polymer/paper-dialog/paper-dialog.js'
+import * as Highcharts from 'highcharts'
+import Exporting from 'highcharts/modules/exporting'
+Exporting(Highcharts)
+import StockChart from 'highcharts/modules/stock'
+StockChart(Highcharts)
+import 'highcharts/highcharts-more.js'
+import 'highcharts/modules/accessibility.js'
+import 'highcharts/modules/boost.js'
+import 'highcharts/modules/data.js'
+import 'highcharts/modules/export-data.js'
+import 'highcharts/modules/offline-exporting.js'
+
+let btcChartDialog
+
+const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+class BtcCharts extends LitElement {
+ static get properties() {
+ return {
+ isLoadingTradesChart: { type: Boolean },
+ btcTrades: { type: Array },
+ btcPrice: { type: Array }
+ }
+ }
+
+ static get styles() {
+ return css`
+ .loadingContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ .trades-chart {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 15px;
+ }
+
+ .chart-container {
+ margin: auto;
+ color: var(--black);
+ text-align: center;
+ padding: 15px;
+ height: 30vh;
+ width: 80vw;
+ }
+
+ .chart-info-wrapper {
+ background: transparent;
+ height: 38vh;
+ width: 83vw;
+ overflow: auto;
+ }
+
+ .chart-loading-wrapper {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ }
+ `
+ }
+
+ constructor() {
+ super()
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
+ this.isLoadingTradesChart = false
+ this.btcTrades = []
+ this.btcPrice = []
+ }
+
+ render() {
+ return html`
+
+
+
+
+ `
+ }
+
+ async firstUpdated() {
+ this.changeTheme()
+ this.changeLanguage()
+
+ window.addEventListener('storage', () => {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+ const checkTheme = localStorage.getItem('qortalTheme')
+
+ use(checkLanguage)
+
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme)
+ })
+ }
+
+ async loadTradesChart() {
+ this.isLoadingTradesChart = true
+ this.shadowRoot.getElementById('loadChartDialog').open()
+ await this.getBtcTrades()
+ this.isLoadingTradesChart = false
+ this.shadowRoot.getElementById('loadChartDialog').close()
+ this.enableBtcStockPriceChart()
+ }
+
+ async getBtcTrades() {
+ let currentBtcTimestamp = Date.now()
+ const monthBackBtc = currentBtcTimestamp - 31556952000
+ await parentEpml.request("apiCall", { url: `/crosschain/trades?foreignBlockchain=BITCOIN&minimumTimestamp=${monthBackBtc}&limit=0&reverse=false` }).then((res) => {
+ this.btcTrades = res
+ })
+
+ this.btcPrice = this.btcTrades.map(item => {
+ const btcSellPrice = this.round(parseFloat(item.foreignAmount) / parseFloat(item.qortAmount))
+ return [item.tradeTimestamp, parseFloat(btcSellPrice)]
+ }).filter(item => !!item)
+ }
+
+ enableBtcStockPriceChart() {
+ const btcStockPriceData = this.btcPrice
+ const header = 'QORT / BTC ' + get("tradepage.tchange49")
+ Highcharts.stockChart(this.shadowRoot.querySelector('#btcStockPriceContainer'), {
+ accessibility: {
+ enabled: false
+ },
+ credits: {
+ enabled: false
+ },
+ rangeSelector: {
+ selected: 1,
+ labelStyle: {color: 'var(--black)'},
+ inputStyle: {color: '#03a9f4'}
+ },
+ chart: {
+ backgroundColor: 'transparent'
+ },
+ title: {
+ text: header,
+ style: {color: 'var(--black)'}
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ series: [{
+ name: 'QORT / BTC',
+ data: btcStockPriceData,
+ tooltip: {
+ valueDecimals: 8
+ }
+ }]
+ })
+ }
+
+ async open() {
+ await this.loadTradesChart()
+ this.shadowRoot.getElementById('btcChartDialog').open()
+ }
+
+ changeTheme() {
+ const checkTheme = localStorage.getItem('qortalTheme')
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme);
+ }
+
+ changeLanguage() {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+
+ if (checkLanguage === null || checkLanguage.length === 0) {
+ localStorage.setItem('qortalLanguage', 'us')
+ use('us')
+ } else {
+ use(checkLanguage)
+ }
+ }
+
+ round(number) {
+ let result = (Math.round(parseFloat(number) * 1e8) / 1e8).toFixed(8)
+ return result
+ }
+}
+
+window.customElements.define('btc-charts', BtcCharts)
+
+const chartsbtc = document.createElement('btc-charts')
+btcChartDialog = document.body.appendChild(chartsbtc)
+
+export default btcChartDialog
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/charts/dgb-charts.js b/qortal-ui-plugins/plugins/core/trade-portal/charts/dgb-charts.js
new file mode 100644
index 00000000..5e57aad7
--- /dev/null
+++ b/qortal-ui-plugins/plugins/core/trade-portal/charts/dgb-charts.js
@@ -0,0 +1,214 @@
+import { LitElement, html, css } from 'lit'
+import { render } from 'lit/html.js'
+import { Epml } from '../../../../epml.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+
+registerTranslateConfig({
+ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
+})
+
+import '@polymer/paper-dialog/paper-dialog.js'
+import * as Highcharts from 'highcharts'
+import Exporting from 'highcharts/modules/exporting'
+Exporting(Highcharts)
+import StockChart from 'highcharts/modules/stock'
+StockChart(Highcharts)
+import 'highcharts/highcharts-more.js'
+import 'highcharts/modules/accessibility.js'
+import 'highcharts/modules/boost.js'
+import 'highcharts/modules/data.js'
+import 'highcharts/modules/export-data.js'
+import 'highcharts/modules/offline-exporting.js'
+
+let dgbChartDialog
+
+const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+class DgbCharts extends LitElement {
+ static get properties() {
+ return {
+ isLoadingTradesChart: { type: Boolean },
+ dgbTrades: { type: Array },
+ dgbPrice: { type: Array }
+ }
+ }
+
+ static get styles() {
+ return css`
+ .loadingContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ .trades-chart {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 15px;
+ }
+
+ .chart-container {
+ margin: auto;
+ color: var(--black);
+ text-align: center;
+ padding: 15px;
+ height: 30vh;
+ width: 80vw;
+ }
+
+ .chart-info-wrapper {
+ background: transparent;
+ height: 38vh;
+ width: 83vw;
+ overflow: auto;
+ }
+
+ .chart-loading-wrapper {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ }
+ `
+ }
+
+ constructor() {
+ super()
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
+ this.isLoadingTradesChart = false
+ this.dgbTrades = []
+ this.dgbPrice = []
+ }
+
+ render() {
+ return html`
+
+
+
+
+ `
+ }
+
+ async firstUpdated() {
+ this.changeTheme()
+ this.changeLanguage()
+
+ window.addEventListener('storage', () => {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+ const checkTheme = localStorage.getItem('qortalTheme')
+
+ use(checkLanguage)
+
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme)
+ })
+ }
+
+ async loadTradesChart() {
+ this.isLoadingTradesChart = true
+ this.shadowRoot.getElementById('loadChartDialog').open()
+ await this.getDgbTrades()
+ this.isLoadingTradesChart = false
+ this.shadowRoot.getElementById('loadChartDialog').close()
+ this.enableDgbStockPriceChart()
+ }
+
+ async getDgbTrades() {
+ let currentDgbTimestamp = Date.now()
+ const monthBackDgb = currentDgbTimestamp - 31556952000
+ await parentEpml.request("apiCall", { url: `/crosschain/trades?foreignBlockchain=DIGIBYTE&minimumTimestamp=${monthBackDgb}&limit=0&reverse=false` }).then((res) => {
+ this.dgbTrades = res
+ })
+ this.dgbPrice = this.dgbTrades.map(item => {
+ const dgbSellPrice = this.round(parseFloat(item.foreignAmount) / parseFloat(item.qortAmount))
+ return [item.tradeTimestamp, parseFloat(dgbSellPrice)]
+ }).filter(item => !!item)
+ }
+
+ enableDgbStockPriceChart() {
+ const dgbStockPriceData = this.dgbPrice
+ const header = 'QORT / DGB ' + get("tradepage.tchange49")
+ Highcharts.stockChart(this.shadowRoot.querySelector('#dgbStockPriceContainer'), {
+ accessibility: {
+ enabled: false
+ },
+ credits: {
+ enabled: false
+ },
+ rangeSelector: {
+ selected: 1,
+ labelStyle: {color: 'var(--black)'},
+ inputStyle: {color: '#03a9f4'}
+ },
+ chart: {
+ backgroundColor: 'transparent'
+ },
+ title: {
+ text: header,
+ style: {color: 'var(--black)'}
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ series: [{
+ name: 'QORT / DGB',
+ data: dgbStockPriceData,
+ tooltip: {
+ valueDecimals: 8
+ }
+ }]
+ })
+ }
+
+ async open() {
+ await this.loadTradesChart()
+ this.shadowRoot.getElementById('dgbChartDialog').open()
+ }
+
+ changeTheme() {
+ const checkTheme = localStorage.getItem('qortalTheme')
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme);
+ }
+
+ changeLanguage() {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+
+ if (checkLanguage === null || checkLanguage.length === 0) {
+ localStorage.setItem('qortalLanguage', 'us')
+ use('us')
+ } else {
+ use(checkLanguage)
+ }
+ }
+
+ round(number) {
+ let result = (Math.round(parseFloat(number) * 1e8) / 1e8).toFixed(8)
+ return result
+ }
+}
+
+window.customElements.define('dgb-charts', DgbCharts)
+
+const chartsdgb = document.createElement('dgb-charts')
+dgbChartDialog = document.body.appendChild(chartsdgb)
+
+export default dgbChartDialog
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/charts/doge-charts.js b/qortal-ui-plugins/plugins/core/trade-portal/charts/doge-charts.js
new file mode 100644
index 00000000..a4267361
--- /dev/null
+++ b/qortal-ui-plugins/plugins/core/trade-portal/charts/doge-charts.js
@@ -0,0 +1,214 @@
+import { LitElement, html, css } from 'lit'
+import { render } from 'lit/html.js'
+import { Epml } from '../../../../epml.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+
+registerTranslateConfig({
+ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
+})
+
+import '@polymer/paper-dialog/paper-dialog.js'
+import * as Highcharts from 'highcharts'
+import Exporting from 'highcharts/modules/exporting'
+Exporting(Highcharts)
+import StockChart from 'highcharts/modules/stock'
+StockChart(Highcharts)
+import 'highcharts/highcharts-more.js'
+import 'highcharts/modules/accessibility.js'
+import 'highcharts/modules/boost.js'
+import 'highcharts/modules/data.js'
+import 'highcharts/modules/export-data.js'
+import 'highcharts/modules/offline-exporting.js'
+
+let dogeChartDialog
+
+const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+class DogeCharts extends LitElement {
+ static get properties() {
+ return {
+ isLoadingTradesChart: { type: Boolean },
+ dogeTrades: { type: Array },
+ dogePrice: { type: Array }
+ }
+ }
+
+ static get styles() {
+ return css`
+ .loadingContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ .trades-chart {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 15px;
+ }
+
+ .chart-container {
+ margin: auto;
+ color: var(--black);
+ text-align: center;
+ padding: 15px;
+ height: 30vh;
+ width: 80vw;
+ }
+
+ .chart-info-wrapper {
+ background: transparent;
+ height: 38vh;
+ width: 83vw;
+ overflow: auto;
+ }
+
+ .chart-loading-wrapper {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ }
+ `
+ }
+
+ constructor() {
+ super()
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
+ this.isLoadingTradesChart = false
+ this.dogeTrades = []
+ this.dogePrice = []
+ }
+
+ render() {
+ return html`
+
+
+
+
+ `
+ }
+
+ async firstUpdated() {
+ this.changeTheme()
+ this.changeLanguage()
+
+ window.addEventListener('storage', () => {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+ const checkTheme = localStorage.getItem('qortalTheme')
+
+ use(checkLanguage)
+
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme)
+ })
+ }
+
+ async loadTradesChart() {
+ this.isLoadingTradesChart = true
+ this.shadowRoot.getElementById('loadChartDialog').open()
+ await this.getDogeTrades()
+ this.isLoadingTradesChart = false
+ this.shadowRoot.getElementById('loadChartDialog').close()
+ this.enableDogeStockPriceChart()
+ }
+
+ async getDogeTrades() {
+ let currentDogeTimestamp = Date.now()
+ const monthBackDoge = currentDogeTimestamp - 31556952000
+ await parentEpml.request("apiCall", { url: `/crosschain/trades?foreignBlockchain=DOGECOIN&minimumTimestamp=${monthBackDoge}&limit=0&reverse=false` }).then((res) => {
+ this.dogeTrades = res
+ })
+ this.dogePrice = this.dogeTrades.map(item => {
+ const dogeSellPrice = this.round(parseFloat(item.foreignAmount) / parseFloat(item.qortAmount))
+ return [item.tradeTimestamp, parseFloat(dogeSellPrice)]
+ }).filter(item => !!item)
+ }
+
+ enableDogeStockPriceChart() {
+ const dogeStockPriceData = this.dogePrice
+ const header = 'QORT / DOGE ' + get("tradepage.tchange49")
+ Highcharts.stockChart(this.shadowRoot.querySelector('#dogeStockPriceContainer'), {
+ accessibility: {
+ enabled: false
+ },
+ credits: {
+ enabled: false
+ },
+ rangeSelector: {
+ selected: 1,
+ labelStyle: {color: 'var(--black)'},
+ inputStyle: {color: '#03a9f4'}
+ },
+ chart: {
+ backgroundColor: 'transparent'
+ },
+ title: {
+ text: header,
+ style: {color: 'var(--black)'}
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ series: [{
+ name: 'QORT / DOGE',
+ data: dogeStockPriceData,
+ tooltip: {
+ valueDecimals: 8
+ }
+ }]
+ })
+ }
+
+ async open() {
+ await this.loadTradesChart()
+ this.shadowRoot.getElementById('dogeChartDialog').open()
+ }
+
+ changeTheme() {
+ const checkTheme = localStorage.getItem('qortalTheme')
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme);
+ }
+
+ changeLanguage() {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+
+ if (checkLanguage === null || checkLanguage.length === 0) {
+ localStorage.setItem('qortalLanguage', 'us')
+ use('us')
+ } else {
+ use(checkLanguage)
+ }
+ }
+
+ round(number) {
+ let result = (Math.round(parseFloat(number) * 1e8) / 1e8).toFixed(8)
+ return result
+ }
+}
+
+window.customElements.define('doge-charts', DogeCharts)
+
+const chartsdoge = document.createElement('doge-charts')
+dogeChartDialog = document.body.appendChild(chartsdoge)
+
+export default dogeChartDialog
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/charts/ltc-charts.js b/qortal-ui-plugins/plugins/core/trade-portal/charts/ltc-charts.js
new file mode 100644
index 00000000..08ffd339
--- /dev/null
+++ b/qortal-ui-plugins/plugins/core/trade-portal/charts/ltc-charts.js
@@ -0,0 +1,214 @@
+import { LitElement, html, css } from 'lit'
+import { render } from 'lit/html.js'
+import { Epml } from '../../../../epml.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+
+registerTranslateConfig({
+ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
+})
+
+import '@polymer/paper-dialog/paper-dialog.js'
+import * as Highcharts from 'highcharts'
+import Exporting from 'highcharts/modules/exporting'
+Exporting(Highcharts)
+import StockChart from 'highcharts/modules/stock'
+StockChart(Highcharts)
+import 'highcharts/highcharts-more.js'
+import 'highcharts/modules/accessibility.js'
+import 'highcharts/modules/boost.js'
+import 'highcharts/modules/data.js'
+import 'highcharts/modules/export-data.js'
+import 'highcharts/modules/offline-exporting.js'
+
+let ltcChartDialog
+
+const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+class LtcCharts extends LitElement {
+ static get properties() {
+ return {
+ isLoadingTradesChart: { type: Boolean },
+ ltcTrades: { type: Array },
+ ltcPrice: { type: Array }
+ }
+ }
+
+ static get styles() {
+ return css`
+ .loadingContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ .trades-chart {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 15px;
+ }
+
+ .chart-container {
+ margin: auto;
+ color: var(--black);
+ text-align: center;
+ padding: 15px;
+ height: 30vh;
+ width: 80vw;
+ }
+
+ .chart-info-wrapper {
+ background: transparent;
+ height: 38vh;
+ width: 83vw;
+ overflow: auto;
+ }
+
+ .chart-loading-wrapper {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ }
+ `
+ }
+
+ constructor() {
+ super()
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
+ this.isLoadingTradesChart = false
+ this.ltcTrades = []
+ this.ltcPrice = []
+ }
+
+ render() {
+ return html`
+
+
+
+
+ `
+ }
+
+ async firstUpdated() {
+ this.changeTheme()
+ this.changeLanguage()
+
+ window.addEventListener('storage', () => {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+ const checkTheme = localStorage.getItem('qortalTheme')
+
+ use(checkLanguage)
+
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme)
+ })
+ }
+
+ async loadTradesChart() {
+ this.isLoadingTradesChart = true
+ this.shadowRoot.getElementById('loadChartDialog').open()
+ await this.getLtcTrades()
+ this.isLoadingTradesChart = false
+ this.shadowRoot.getElementById('loadChartDialog').close()
+ this.enableLtcStockPriceChart()
+ }
+
+ async getLtcTrades() {
+ let currentLtcTimestamp = Date.now()
+ const monthBackLtc = currentLtcTimestamp - 31556952000
+ await parentEpml.request("apiCall", { url: `/crosschain/trades?foreignBlockchain=LITECOIN&minimumTimestamp=${monthBackLtc}&limit=0&reverse=false` }).then((res) => {
+ this.ltcTrades = res
+ })
+ this.ltcPrice = this.ltcTrades.map(item => {
+ const ltcSellPrice = this.round(parseFloat(item.foreignAmount) / parseFloat(item.qortAmount))
+ return [item.tradeTimestamp, parseFloat(ltcSellPrice)]
+ }).filter(item => !!item)
+ }
+
+ enableLtcStockPriceChart() {
+ const ltcStockPriceData = this.ltcPrice
+ const header = 'QORT / LTC ' + get("tradepage.tchange49")
+ Highcharts.stockChart(this.shadowRoot.querySelector('#ltcStockPriceContainer'), {
+ accessibility: {
+ enabled: false
+ },
+ credits: {
+ enabled: false
+ },
+ rangeSelector: {
+ selected: 1,
+ labelStyle: {color: 'var(--black)'},
+ inputStyle: {color: '#03a9f4'}
+ },
+ chart: {
+ backgroundColor: 'transparent'
+ },
+ title: {
+ text: header,
+ style: {color: 'var(--black)'}
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ series: [{
+ name: 'QORT / LTC',
+ data: ltcStockPriceData,
+ tooltip: {
+ valueDecimals: 8
+ }
+ }]
+ })
+ }
+
+ async open() {
+ await this.loadTradesChart()
+ this.shadowRoot.getElementById('ltcChartDialog').open()
+ }
+
+ changeTheme() {
+ const checkTheme = localStorage.getItem('qortalTheme')
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme);
+ }
+
+ changeLanguage() {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+
+ if (checkLanguage === null || checkLanguage.length === 0) {
+ localStorage.setItem('qortalLanguage', 'us')
+ use('us')
+ } else {
+ use(checkLanguage)
+ }
+ }
+
+ round(number) {
+ let result = (Math.round(parseFloat(number) * 1e8) / 1e8).toFixed(8)
+ return result
+ }
+}
+
+window.customElements.define('ltc-charts', LtcCharts)
+
+const chartsltc = document.createElement('ltc-charts')
+ltcChartDialog = document.body.appendChild(chartsltc)
+
+export default ltcChartDialog
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/charts/rvn-charts.js b/qortal-ui-plugins/plugins/core/trade-portal/charts/rvn-charts.js
new file mode 100644
index 00000000..1110bdfc
--- /dev/null
+++ b/qortal-ui-plugins/plugins/core/trade-portal/charts/rvn-charts.js
@@ -0,0 +1,214 @@
+import { LitElement, html, css } from 'lit'
+import { render } from 'lit/html.js'
+import { Epml } from '../../../../epml.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+
+registerTranslateConfig({
+ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
+})
+
+import '@polymer/paper-dialog/paper-dialog.js'
+import * as Highcharts from 'highcharts'
+import Exporting from 'highcharts/modules/exporting'
+Exporting(Highcharts)
+import StockChart from 'highcharts/modules/stock'
+StockChart(Highcharts)
+import 'highcharts/highcharts-more.js'
+import 'highcharts/modules/accessibility.js'
+import 'highcharts/modules/boost.js'
+import 'highcharts/modules/data.js'
+import 'highcharts/modules/export-data.js'
+import 'highcharts/modules/offline-exporting.js'
+
+let rvnChartDialog
+
+const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
+
+class RvnCharts extends LitElement {
+ static get properties() {
+ return {
+ isLoadingTradesChart: { type: Boolean },
+ rvnTrades: { type: Array },
+ rvnPrice: { type: Array }
+ }
+ }
+
+ static get styles() {
+ return css`
+ .loadingContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ .trades-chart {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 15px;
+ }
+
+ .chart-container {
+ margin: auto;
+ color: var(--black);
+ text-align: center;
+ padding: 15px;
+ height: 30vh;
+ width: 80vw;
+ }
+
+ .chart-info-wrapper {
+ background: transparent;
+ height: 38vh;
+ width: 83vw;
+ overflow: auto;
+ }
+
+ .chart-loading-wrapper {
+ color: var(--black);
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ }
+ `
+ }
+
+ constructor() {
+ super()
+ this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
+ this.isLoadingTradesChart = false
+ this.rvnTrades = []
+ this.rvnPrice = []
+ }
+
+ render() {
+ return html`
+
+
+
+
+ `
+ }
+
+ async firstUpdated() {
+ this.changeTheme()
+ this.changeLanguage()
+
+ window.addEventListener('storage', () => {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+ const checkTheme = localStorage.getItem('qortalTheme')
+
+ use(checkLanguage)
+
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme)
+ })
+ }
+
+ async loadTradesChart() {
+ this.isLoadingTradesChart = true
+ this.shadowRoot.getElementById('loadChartDialog').open()
+ await this.getRvnTrades()
+ this.isLoadingTradesChart = false
+ this.shadowRoot.getElementById('loadChartDialog').close()
+ this.enableRvnStockPriceChart()
+ }
+
+ async getRvnTrades() {
+ let currentRvnTimestamp = Date.now()
+ const monthBackRvn = currentRvnTimestamp - 31556952000
+ await parentEpml.request("apiCall", { url: `/crosschain/trades?foreignBlockchain=RAVENCOIN&minimumTimestamp=${monthBackRvn}&limit=0&reverse=false` }).then((res) => {
+ this.rvnTrades = res
+ })
+ this.rvnPrice = this.rvnTrades.map(item => {
+ const rvnSellPrice = this.round(parseFloat(item.foreignAmount) / parseFloat(item.qortAmount))
+ return [item.tradeTimestamp, parseFloat(rvnSellPrice)]
+ }).filter(item => !!item)
+ }
+
+ enableRvnStockPriceChart() {
+ const rvnStockPriceData = this.rvnPrice
+ const header = 'QORT / RVN ' + get("tradepage.tchange49")
+ Highcharts.stockChart(this.shadowRoot.querySelector('#rvnStockPriceContainer'), {
+ accessibility: {
+ enabled: false
+ },
+ credits: {
+ enabled: false
+ },
+ rangeSelector: {
+ selected: 1,
+ labelStyle: {color: 'var(--black)'},
+ inputStyle: {color: '#03a9f4'}
+ },
+ chart: {
+ backgroundColor: 'transparent'
+ },
+ title: {
+ text: header,
+ style: {color: 'var(--black)'}
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#03a9f4'
+ }
+ }
+ },
+ series: [{
+ name: 'QORT / RVN',
+ data: rvnStockPriceData,
+ tooltip: {
+ valueDecimals: 8
+ }
+ }]
+ })
+ }
+
+ async open() {
+ await this.loadTradesChart()
+ this.shadowRoot.getElementById('rvnChartDialog').open()
+ }
+
+ changeTheme() {
+ const checkTheme = localStorage.getItem('qortalTheme')
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
+ document.querySelector('html').setAttribute('theme', this.theme);
+ }
+
+ changeLanguage() {
+ const checkLanguage = localStorage.getItem('qortalLanguage')
+
+ if (checkLanguage === null || checkLanguage.length === 0) {
+ localStorage.setItem('qortalLanguage', 'us')
+ use('us')
+ } else {
+ use(checkLanguage)
+ }
+ }
+
+ round(number) {
+ let result = (Math.round(parseFloat(number) * 1e8) / 1e8).toFixed(8)
+ return result
+ }
+}
+
+window.customElements.define('rvn-charts', RvnCharts)
+
+const chartsrvn = document.createElement('rvn-charts')
+rvnChartDialog = document.body.appendChild(chartsrvn)
+
+export default rvnChartDialog
\ No newline at end of file
From df9dcd20f942ed106dc5b2669f7648cd12fbf76c Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Mon, 9 Jan 2023 15:09:00 +0100
Subject: [PATCH 14/14] Added charts
---
qortal-ui-core/language/de.json | 3 +-
qortal-ui-core/language/es.json | 3 +-
qortal-ui-core/language/fr.json | 3 +-
qortal-ui-core/language/hindi.json | 3 +-
qortal-ui-core/language/hr.json | 3 +-
qortal-ui-core/language/hu.json | 3 +-
qortal-ui-core/language/it.json | 3 +-
qortal-ui-core/language/ko.json | 3 +-
qortal-ui-core/language/no.json | 3 +-
qortal-ui-core/language/pl.json | 3 +-
qortal-ui-core/language/pt.json | 3 +-
qortal-ui-core/language/ro.json | 3 +-
qortal-ui-core/language/rs.json | 3 +-
qortal-ui-core/language/ru.json | 3 +-
qortal-ui-core/language/us.json | 3 +-
qortal-ui-core/language/zhc.json | 3 +-
qortal-ui-core/language/zht.json | 3 +-
.../core/trade-portal/trade-portal.src.js | 48 ++++++++++++++++---
18 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json
index cedb6452..518cab5c 100644
--- a/qortal-ui-core/language/de.json
+++ b/qortal-ui-core/language/de.json
@@ -333,7 +333,8 @@
"tchange45":"AUTO KAUFEN MIT",
"tchange46":"AUTOKAUF",
"tchange47":"Verkaufe für diesen Preis",
- "tchange48":"NICHT GENUG"
+ "tchange48":"NICHT GENUG",
+ "tchange49":"Preisdiagramm"
},
"rewardsharepage":{
"rchange1":"Belohnungsanteile",
diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json
index adf6d85c..eab3f6d0 100644
--- a/qortal-ui-core/language/es.json
+++ b/qortal-ui-core/language/es.json
@@ -333,7 +333,8 @@
"tchange45":"AUTO COMPRAR CON",
"tchange46":"COMPRA AUTOMÁTICA",
"tchange47":"Vender por este precio",
- "tchange48":"NO ES SUFICIENTE"
+ "tchange48":"NO ES SUFICIENTE",
+ "tchange49":"Gráfico de precios"
},
"rewardsharepage":{
"rchange1":"Rewardshares",
diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json
index 86b02d49..f22be6c5 100644
--- a/qortal-ui-core/language/fr.json
+++ b/qortal-ui-core/language/fr.json
@@ -333,7 +333,8 @@
"tchange45":"ACHAT AUTO AVEC",
"tchange46":"ACHAT AUTOMATIQUE",
"tchange47":"Vendre à ce prix",
- "tchange48":"PAS ASSEZ"
+ "tchange48":"PAS ASSEZ",
+ "tchange49":"Tableau des prix"
},
"rewardsharepage":{
"rchange1":"Récompenses",
diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json
index e82ab1b0..617a2b64 100644
--- a/qortal-ui-core/language/hindi.json
+++ b/qortal-ui-core/language/hindi.json
@@ -334,7 +334,8 @@
"tchange45":"ऑटो के साथ खरीदें",
"tchange46":"ऑटो खरीदें",
"tchange47":"इस कीमत पर बेचें",
- "tchange48":"पर्याप्त नहीं"
+ "tchange48":"पर्याप्त नहीं",
+ "tchange49":"मूल्य चार्ट"
},
"rewardsharepage":{
"rchange1":"रिवॉर्डशेयर",
diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json
index 40689c8f..3b369348 100644
--- a/qortal-ui-core/language/hr.json
+++ b/qortal-ui-core/language/hr.json
@@ -333,7 +333,8 @@
"tchange45":"AUTO KUPITE SA",
"tchange46":"AUTO OTKUP",
"tchange47":"Prodaj za ovu cijenu",
- "tchange48":"NEDOVOLJNO"
+ "tchange48":"NEDOVOLJNO",
+ "tchange49":"Grafikon cijena"
},
"rewardsharepage":{
"rchange1":"Nagradni udio (Rewardshares)",
diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json
index 7b57ad70..c30d020d 100644
--- a/qortal-ui-core/language/hu.json
+++ b/qortal-ui-core/language/hu.json
@@ -333,7 +333,8 @@
"tchange45":"AUTOMATIKUS VÁSÁRLÁS",
"tchange46":"AUTOMATIKUS VÁSÁRLÁS",
"tchange47":"Eladni ezen az áron",
- "tchange48":"NEM ELÉG"
+ "tchange48":"NEM ELÉG",
+ "tchange49":"Árdiagram"
},
"rewardsharepage":{
"rchange1":"Jutalommegosztások",
diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json
index e669f6de..6efe10d4 100644
--- a/qortal-ui-core/language/it.json
+++ b/qortal-ui-core/language/it.json
@@ -333,7 +333,8 @@
"tchange45":"ACQUISTA AUTO CON",
"tchange46":"ACQUISTO AUTO",
"tchange47":"Vendi a questo prezzo",
- "tchange48":"NON ABBASTANZA"
+ "tchange48":"NON ABBASTANZA",
+ "tchange49":"Tabella dei prezzi"
},
"rewardsharepage":{
"rchange1":"Quote di ricompensa",
diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json
index 4eed1cbc..2dc9b4d6 100644
--- a/qortal-ui-core/language/ko.json
+++ b/qortal-ui-core/language/ko.json
@@ -333,7 +333,8 @@
"tchange45":"자동 구매",
"tchange46":"자동 구매",
"tchange47":"이 가격에 팔아요",
- "tchange48":"부족한"
+ "tchange48":"부족한",
+ "tchange49":"가격 차트"
},
"rewardsharepage":{
"rchange1":"보상 공유",
diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json
index 7795fa96..85054308 100644
--- a/qortal-ui-core/language/no.json
+++ b/qortal-ui-core/language/no.json
@@ -333,7 +333,8 @@
"tchange45":"AUTOKJØP MED",
"tchange46":"AUTOKJØP",
"tchange47":"Selges for denne prisen",
- "tchange48":"IKKE NOK"
+ "tchange48":"IKKE NOK",
+ "tchange49":"Prisdiagram"
},
"rewardsharepage":{
"rchange1":"Belønningsdel",
diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json
index 5fbd3224..0b3ef019 100644
--- a/qortal-ui-core/language/pl.json
+++ b/qortal-ui-core/language/pl.json
@@ -333,7 +333,8 @@
"tchange45":"AUTO KUP Z",
"tchange46":"AUTO KUP",
"tchange47":"Sprzedaj za tę cenę",
- "tchange48":"NIEWYSTARCZAJĄCO"
+ "tchange48":"NIEWYSTARCZAJĄCO",
+ "tchange49":"Tabela cen"
},
"rewardsharepage":{
"rchange1":"Podział nagród",
diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json
index c731226f..41e55557 100644
--- a/qortal-ui-core/language/pt.json
+++ b/qortal-ui-core/language/pt.json
@@ -333,7 +333,8 @@
"tchange45":"COMPRA AUTOMÁTICA COM",
"tchange46":"COMPRA AUTOMÁTICA",
"tchange47":"Vendo por este preço",
- "tchange48":"INSUFICIENTE"
+ "tchange48":"INSUFICIENTE",
+ "tchange49":"Tabela de preços"
},
"rewardsharepage":{
"rchange1":"Ações de recompensa",
diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json
index 60bce846..29efe5b0 100644
--- a/qortal-ui-core/language/ro.json
+++ b/qortal-ui-core/language/ro.json
@@ -333,7 +333,8 @@
"tchange45":"CUMPARA AUTOMATA CU",
"tchange46":"CUMPARARE AUTOMATA",
"tchange47":"Vinde la acest pret",
- "tchange48":"INSUFICIENT"
+ "tchange48":"INSUFICIENT",
+ "tchange49":"Diagrama prețurilor"
},
"rewardsharepage":{
"rchange1":"Cote de recompensa",
diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json
index c7ad6d88..ccd07326 100644
--- a/qortal-ui-core/language/rs.json
+++ b/qortal-ui-core/language/rs.json
@@ -333,7 +333,8 @@
"tchange45":"AUTO KUPI SA",
"tchange46":"AUTO BUI",
"tchange47":"Prodaj za ovu cenu",
- "tchange48":"NEDOVOLJNO"
+ "tchange48":"NEDOVOLJNO",
+ "tchange49":"Grafik cena"
},
"rewardsharepage":{
"rchange1":"Udeo nagrade",
diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json
index abad841f..b7539374 100644
--- a/qortal-ui-core/language/ru.json
+++ b/qortal-ui-core/language/ru.json
@@ -333,7 +333,8 @@
"tchange45":"АВТО КУПИТЬ С",
"tchange46":"АВТО КУПИТЬ",
"tchange47":"Продать по этой цене",
- "tchange48":"НЕДОСТАТОЧНО"
+ "tchange48":"НЕДОСТАТОЧНО",
+ "tchange49":"График цен"
},
"rewardsharepage":{
"rchange1":"Вознаграждения",
diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json
index 580d0549..e0444893 100644
--- a/qortal-ui-core/language/us.json
+++ b/qortal-ui-core/language/us.json
@@ -333,7 +333,8 @@
"tchange45":"AUTO BUY WITH",
"tchange46":"AUTO BUY",
"tchange47":"Sell for this price",
- "tchange48":"NOT ENOUGH"
+ "tchange48":"NOT ENOUGH",
+ "tchange49":"Price Chart"
},
"rewardsharepage":{
"rchange1":"Rewardshares",
diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json
index b41114a8..b2b1a6b4 100644
--- a/qortal-ui-core/language/zhc.json
+++ b/qortal-ui-core/language/zhc.json
@@ -333,7 +333,8 @@
"tchange45":"自动购买",
"tchange46":"自动购买",
"tchange47":"以这个价格出售",
- "tchange48":"不够"
+ "tchange48":"不够",
+ "tchange49":"价格图表"
},
"rewardsharepage":{
"rchange1":"铸币密钥",
diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json
index 52fa5400..2c5c86f3 100644
--- a/qortal-ui-core/language/zht.json
+++ b/qortal-ui-core/language/zht.json
@@ -333,7 +333,8 @@
"tchange45":"自動購買",
"tchange46":"自動購買",
"tchange47":"以這個價格出售",
- "tchange48":"不夠"
+ "tchange48":"不夠",
+ "tchange49":"價格圖表"
},
"rewardsharepage":{
"rchange1":"鑄幣密鑰",
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 47910961..bcfd5130 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
@@ -21,6 +21,12 @@ import '@polymer/paper-icon-button/paper-icon-button.js'
import '@polymer/paper-spinner/paper-spinner-lite.js'
import '@vaadin/grid'
import '@vaadin/grid/vaadin-grid-sorter'
+import chartsbtc from './charts/btc-charts.js'
+import chartsltc from './charts/ltc-charts.js'
+import chartsdoge from './charts/doge-charts.js'
+import chartsdgb from './charts/dgb-charts.js'
+import chartsrvn from './charts/rvn-charts.js'
+import chartsarrr from './charts/arrr-charts.js'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
@@ -74,7 +80,7 @@ class TradePortal extends LitElement {
displayTradeAddress: { type: String },
displayTradeLevel: { type: String },
displayTradeBalance: { type: String },
- qortRatio: {type: Number}
+ qortRatio: {type: Number}
}
}
@@ -494,7 +500,7 @@ class TradePortal extends LitElement {
.rvn.coinName:before {
background-image: url('/img/qortrvn.png');
}
- .arrr.coinName:before {
+ .arrr.coinName:before {
background-image: url('/img/qortarrr.png');
}
.coinName {
@@ -655,7 +661,7 @@ class TradePortal extends LitElement {
tradeFee: "~0.0005"
}
- let ravencoin = {
+ let ravencoin = {
name: "RAVENCOIN",
balance: "0",
coinCode: "RVN",
@@ -721,7 +727,7 @@ class TradePortal extends LitElement {
handleStuckTradesConnectedWorker: null
})
- workers.set("RAVENCOIN", {
+ workers.set("RAVENCOIN", {
tradesConnectedWorker: null,
handleStuckTradesConnectedWorker: null
})
@@ -1162,6 +1168,9 @@ class TradePortal extends LitElement {
QORT / RVN
QORT / ARRR
+
+ ${translate("login.loading")}
+
+
+
+
+
+ ${translate("login.loading")}
+
+
+
+
+
+ ${translate("login.loading")}
+
+
+
+
+
+ ${translate("login.loading")}
+
+
+
+
+
+ ${translate("login.loading")}
+
+
+
+
+
+ ${translate("login.loading")}
+
+
+
+
+
+ ${this.chartShowCoin()}
+
@@ -1412,6 +1421,31 @@ class TradePortal extends LitElement {
return html`NOT ENOUGH ${this.listedCoins.get(this.selectedCoin).coinCode}`
}
+ chartShowCoin() {
+ switch(this.listedCoins.get(this.selectedCoin).coinCode) {
+ case "BTC":
+ return html` chartsbtc.open()}> `
+ break
+ case "LTC":
+ return html` chartsltc.open()}> `
+ break
+ case "DOGE":
+ return html` chartsdoge.open()}> `
+ break
+ case "DGB":
+ return html` chartsdgb.open()}> `
+ break
+ case "RVN":
+ return html` chartsrvn.open()}> `
+ break
+ case "ARRR":
+ return html` chartsarrr.open()}> `
+ break
+ default:
+ break
+ }
+ }
+
exchangeRateQort() {
switch(this.listedCoins.get(this.selectedCoin).coinCode) {
case "BTC":
@@ -1504,8 +1538,8 @@ class TradePortal extends LitElement {
case 'DIGIBYTE':
_url = `/crosschain/dgb/walletbalance?apiKey=${this.getApiKey()}`
_body = window.parent.reduxStore.getState().app.selectedAddress.dgbWallet.derivedMasterPublicKey
- break
- case 'RAVENCOIN':
+ break
+ case 'RAVENCOIN':
_url = `/crosschain/rvn/walletbalance?apiKey=${this.getApiKey()}`
_body = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.derivedMasterPublicKey
break
@@ -2945,4 +2979,4 @@ class TradePortal extends LitElement {
}
}
-window.customElements.define('trade-portal', TradePortal)
+window.customElements.define('trade-portal', TradePortal)
\ No newline at end of file