Browse Source

WIP

digibyte
AlphaX-Projects 2 years ago committed by GitHub
parent
commit
6b3bed02c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 69
      qortal-ui-plugins/package.json
  2. 6
      qortal-ui-plugins/plugins/core/minting/minting-info.src.js
  3. 2
      qortal-ui-plugins/plugins/core/node-management/node-management.src.js
  4. 9
      qortal-ui-plugins/plugins/core/reward-share/reward-share.src.js

69
qortal-ui-plugins/package.json

@ -1,6 +1,6 @@
{
"name": "qortal-ui-plugins",
"version": "2.2.0",
"version": "2.2.1",
"description": "QORTAL-UI Plugins",
"keywords": [
"QORT",
@ -17,42 +17,43 @@
"author": "QORTAL <[email protected]>",
"license": "GPL-3.0",
"dependencies": {
"@material/mwc-list": "^0.25.3",
"@material/mwc-select": "^0.25.3",
"@material/mwc-list": "0.25.3",
"@material/mwc-select": "0.25.3",
"emoji-picker-js": "https://github.com/Qortal/emoji-picker-js"
},
"devDependencies": {
"@babel/core": "^7.17.8",
"@github/time-elements": "^3.1.2",
"@material/mwc-button": "^0.25.3",
"@material/mwc-checkbox": "^0.25.3",
"@material/mwc-dialog": "^0.25.3",
"@material/mwc-formfield": "^0.25.3",
"@material/mwc-icon": "^0.25.3",
"@material/mwc-icon-button": "^0.25.3",
"@material/mwc-slider": "^0.25.3",
"@material/mwc-snackbar": "^0.25.3",
"@material/mwc-tab": "^0.25.3",
"@material/mwc-tab-bar": "^0.25.3",
"@material/mwc-textfield": "^0.25.3",
"@polymer/paper-progress": "^3.0.1",
"@polymer/paper-slider": "^3.0.1",
"@polymer/paper-spinner": "^3.0.2",
"@rollup/plugin-alias": "^3.1.9",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-replace": "^4.0.0",
"@vaadin/button": "^23.0.2",
"@vaadin/grid": "^23.0.2",
"@vaadin/icons": "^23.0.2",
"epml": "^0.3.3",
"html-escaper": "^3.0.3",
"lit": "^2.2.1",
"rollup": "^2.70.1",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-progress": "^1.1.2",
"rollup-plugin-terser": "^7.0.2"
"@babel/core": "^7.17.9",
"@github/time-elements": "3.1.2",
"@material/mwc-button": "0.25.3",
"@material/mwc-checkbox": "0.25.3",
"@material/mwc-dialog": "0.25.3",
"@material/mwc-formfield": "0.25.3",
"@material/mwc-icon": "0.25.3",
"@material/mwc-icon-button": "0.25.3",
"@material/mwc-slider": "0.25.3",
"@material/mwc-snackbar": "0.25.3",
"@material/mwc-tab": "0.25.3",
"@material/mwc-tab-bar": "0.25.3",
"@material/mwc-textfield": "0.25.3",
"@polymer/paper-progress": "3.0.1",
"@polymer/paper-slider": "3.0.1",
"@polymer/paper-spinner": "3.0.2",
"@rollup/plugin-alias": "3.1.9",
"@rollup/plugin-babel": "5.3.1",
"@rollup/plugin-commonjs": "21.0.3",
"@rollup/plugin-node-resolve": "13.1.3",
"@rollup/plugin-replace": "4.0.0",
"@vaadin/button": "23.0.5",
"@vaadin/grid": "23.0.5",
"@vaadin/icons": "23.0.5",
"epml": "0.3.3",
"html-escaper": "3.0.3",
"lit": "2.2.2",
"lit-translate": "2.0.0-rc.1",
"rollup": "2.70.1",
"rollup-plugin-node-globals": "1.4.0",
"rollup-plugin-progress": "1.1.2",
"rollup-plugin-terser": "7.0.2"
},
"engines": {
"node": ">=14.17.0"

6
qortal-ui-plugins/plugins/core/minting/minting-info.src.js

@ -385,7 +385,7 @@ class MintingInfo extends LitElement {
};
const getSampleBlock = () => {
let callBlock = parseFloat(this.nodeInfo.height) - 1440;
let callBlock = parseFloat(this.nodeInfo.height) - 10000;
parentEpml.request("apiCall", { url: `/blocks/byheight/${callBlock}` }).then((res) => {
setTimeout(() => { this.sampleBlock = res; }, 1);
});
@ -462,14 +462,14 @@ class MintingInfo extends LitElement {
}
_averageBlockTime() {
let avgBlockString = (this.adminInfo.currentTimestamp - this.sampleBlock.timestamp).toString();
let averageTimeString = ((avgBlockString / 1000) / 1440).toFixed(2);
let averageTimeString = ((avgBlockString / 1000) / 10000).toFixed(2);
let averageBlockTimeString = (averageTimeString).toString();
return "" + averageBlockTimeString;
}
_timeCalc() {
let timeString = (this.adminInfo.currentTimestamp - this.sampleBlock.timestamp).toString();
let averageString = ((timeString / 1000) / 1440).toFixed(2);
let averageString = ((timeString / 1000) / 10000).toFixed(2);
let averageBlockDay = (86400 / averageString).toFixed(2);
let averageBlockDayString = (averageBlockDay).toString();
return "" + averageBlockDayString;

2
qortal-ui-plugins/plugins/core/node-management/node-management.src.js

@ -350,7 +350,7 @@ class NodeManagement extends LitElement {
this.peers = res;
}, 1);
});
console.log(this.peers)
setTimeout(updatePeers, this.config.user.nodeSettings.pingInterval);
};

9
qortal-ui-plugins/plugins/core/reward-share/reward-share.src.js

@ -104,7 +104,7 @@ class RewardShare extends LitElement {
<vaadin-grid-column auto-width path="mintingAccount"></vaadin-grid-column>
<vaadin-grid-column auto-width path="sharePercent"></vaadin-grid-column>
<vaadin-grid-column auto-width path="recipient"></vaadin-grid-column>
<vaadin-grid-column width="12em" header="Action" .renderer=${(root, column, data) => {
<vaadin-grid-column width="12em" header="Action / Type" .renderer=${(root, column, data) => {
render(html`${this.renderRemoveRewardShareButton(data.item)}`, root)
}}>
</vaadin-grid-column>
@ -218,9 +218,7 @@ class RewardShare extends LitElement {
})
parentEpml.subscribe('copy_menu_switch', async value => {
if (value === 'false' && window.getSelection().toString().length !== 0) {
this.clearSelection()
}
})
@ -228,7 +226,6 @@ class RewardShare extends LitElement {
parentEpml.subscribe('frame_paste_menu_switch', async res => {
res = JSON.parse(res)
if (res.isOpen === false && this.isPasteMenuOpen === true) {
this.pasteToTextBox(textBox)
this.isPasteMenuOpen = false
}
@ -278,9 +275,9 @@ class RewardShare extends LitElement {
renderRemoveRewardShareButton(rewardShareObject) {
if (rewardShareObject.mintingAccount === this.selectedAddress.address) {
return html`<mwc-button class="red" ?disabled=${this.removeRewardShareLoading} @click=${() => this.removeRewardShare(rewardShareObject)}><mwc-icon>create</mwc-icon>Remove</mwc-button>`
return html`Own Rewardshare`
} else {
return ""
return html`<mwc-button class="red" ?disabled=${this.removeRewardShareLoading} @click=${() => this.removeRewardShare(rewardShareObject)}><mwc-icon>create</mwc-icon>Remove</mwc-button>`
}
}

Loading…
Cancel
Save