Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjusted css and add Blocks/s #1

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

adjusted css and add Blocks/s #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d033a
adjusted css
x100111010 Nov 23, 2024
3a84ced
add bps
x100111010 Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions http/faucet-balance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export class FaucetBalance extends BaseElement {
this.balances = {};
this.blueScores = {};
//this.network = flow.app.network;
this.timestamps = [];
this.lastBlueScore = null;
}

onlineCallback() {
Expand Down Expand Up @@ -91,6 +93,30 @@ export class FaucetBalance extends BaseElement {
(async () => {
for await (const msg of this.blueScoreUpdates) {
const { network, blueScore } = msg.data;

const currentTimestamp = performance.now();

if (this.lastBlueScore !== null) {
this.timestamps.push(currentTimestamp);
if (this.timestamps.length > 10) {
this.timestamps.shift();
}

if (this.timestamps.length > 1) {
const timeDiff =
(this.timestamps[this.timestamps.length - 1] -
this.timestamps[0]) /
1000;
const blocksMined = this.timestamps.length - 1;

if (timeDiff > 0) {
this.blocksSinceLastUpdate = blocksMined / timeDiff;
}
}
}

this.lastBlueScore = parseInt(blueScore, 10);

this.blueScores[network] = blueScore;
if (this.network == network) this.requestUpdate();
}
Expand All @@ -112,6 +138,9 @@ export class FaucetBalance extends BaseElement {
const blueScore = this.blueScores[this.network]
? FlowFormat.commas(this.blueScores[this.network])
: "---";
const blocksSinceLastUpdate = this.blocksSinceLastUpdate
? this.blocksSinceLastUpdate.toFixed(1)
: "--.-";

return html`
<div class="wrapper">
Expand All @@ -122,6 +151,11 @@ export class FaucetBalance extends BaseElement {
<div class="tiny-caption">DAG BLUE SCORE</div>
<div class="tiny-value">${blueScore}</div>
</div>
<div class="blue-score" col>
<div class="tiny-caption">BLOCKS/S</div>
<div class="tiny-value">${blocksSinceLastUpdate}</div>
</div>

${pending
? html`
<div class="pending" col>
Expand Down
52 changes: 26 additions & 26 deletions http/style/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body.loading:after {
top: 0px;
right: 0px;
bottom: 0px;
background: rgb(255, 255, 255) no-repeat center;
background: rgb(46, 46, 46) no-repeat center;
background-image: url("/images/spinner.svg");
background-size: 100px auto;
min-height: 100vh;
Expand Down Expand Up @@ -112,8 +112,8 @@ body:not(.flow-theme-light) {
}

.flow-theme-light .menu li.active {
--fa-icon-color: #ffffff;
color: #ffffff;
--fa-icon-color: #3c0e0e;
color: #3c0e0e;
}

.logo.light {
Expand Down Expand Up @@ -173,7 +173,7 @@ body.flow-theme-dark {
--color-box-active-border-color: #b1b1b1;
--flow-box-shadow: 0 2px 2px 0 rgba(10, 10, 10, 0.14),
0 3px 1px -2px rgba(10, 10, 10, 0.2), 0 1px 5px 0 rgba(10, 10, 10, 0.12);
--flow-background-inverse: #ffffff;
--flow-background-inverse: #3c0e0e;
--flow-background-inverse-soft: #cccccc;
--flow-background-color: #131723; /*#232323;*/
color: #b1b1b1;
Expand All @@ -188,8 +188,8 @@ body.flow-theme-dark {
--flow-list-item-active-border: 1px solid var(--flow-primary-color);
--flow-list-item-hover-bg: #585858;
--flow-list-item-active-bg: var(--flow-primary-color);
--flow-list-item-active-color: #ffffff;
--flow-data-field-value: #ffffff;
--flow-list-item-active-color: #3c0e0e;
--flow-data-field-value: #3c0e0e;
--flow-data-field-caption: #cccccc;
--flow-data-field-caption-shadow: rgba(209, 142, 121);

Expand All @@ -207,7 +207,7 @@ body.flow-theme-dark {
--flow-input-line-height: 1;
--flow-input-margin: 20px 0px;
--flow-input-padding: 10px 10px 10px 16px;
--flow-input-bg: white;
--flow-input-bg: #3c0e0e;
--flow-input-color: #585858;
--flow-input-placeholder: #aaaaaa;
--flow-input-border: 0px;
Expand All @@ -223,10 +223,10 @@ body.flow-theme-dark {
--flow-select-border: var(--flow-input-border);
--flow-select-label-border: 0px;
--flow-select-selected-min-width: 200px;
--flow-btn-primary-bg-color: #4c5157;
--flow-btn-primary-border-color: #4c5157;
--flow-btn-hover-border-color: #808080;
--flow-btn-hover-primary-bg-color: #808080;
--flow-btn-primary-bg-color: #ff005a;
--flow-btn-primary-border-color: #000000;
--flow-btn-hover-border-color: #000000;
--flow-btn-hover-primary-bg-color: #b30042;
--flow-btn-hover-primary-color: #000000;
--flow-btn-border-color: none;
--flow-btn-border-width: 1.5px;
Expand All @@ -251,43 +251,43 @@ body.flow-theme-dark {
--flow-pagination-margin: 4px 4px;
--flow-border-hover-color: rgb(231, 106, 106);
--flow-link-hover-color: #015b77;
--flow-sunburst-graph-tip-color: white;
--flow-sunburst-graph-tip-color: #3c0e0e;
--flow-gridstack-placeholder-bg: #aaaaaa;
background-color: #ffffff;
--flow-color: #585858;
background-color: #121212;
--flow-color: #ff005a;
color: var(--flow-color);
--flow-primary-color: #828080; /* var(--flow-color); */
--flow-border-color: rgb(29, 46, 46);
--flow-border-color: #ff005a;
--flow-app-header-height: 100px;
--flow-app-header-bg: rgba(200, 200, 200, 0.15);
--flow-app-drawer-bg: white;
--flow-list-item-active-bg: white;
--flow-app-drawer-bg: #3c0e0e;
--flow-list-item-active-bg: #3c0e0e;
--flow-list-item-hover-bg: #585858;
--flow-list-item-active-color: #585858;
--flow-background-inverse: #ffffff;
--flow-background-inverse: #3c0e0e;
--flow-background-inverse-soft: #838383;
--flow-background-color: var(--flow-color);
--panel-bg: #ffffff;
--panel-bg: #3c0e0e;
--flow-btn-hover-bg-color: var(--finfr-order-entry-primary-color);
--flow-btn-hover-color: #ffffff;
--flow-btn-hover-color: #3c0e0e;
--flow-terminal-bg-color: var(--panel-bg);
--flow-terminal-color: var(--flow-color);
--flow-font-family: "Trebuchet MS";
--flow-data-badge-font-family: "Exo 2";
--flow-data-badge-value-font-family: "Exo 2";
--flow-data-badge-font-weight: normal;
--flow-menu-item-selected-bg: #ffffff;
--flow-menu-item-selected-bg: #3c0e0e;
--flow-link-color: #3289f9;
--flow-link-hover-color: rgb(0, 223, 255);
--flow-link-font-family: "Open Sans";
--flow-link-font-weight: normal;
--flow-dropdown-bg: white;
--flow-appdrawer-btn-bg: white;
--flow-menu-item-bg: #f5f4f4;
--flow-dialog-background-color: white;
--flow-dropdown-bg: #3c0e0e;
--flow-appdrawer-btn-bg: #3c0e0e;
--flow-menu-item-bg: #3c0e0e;
--flow-dialog-background-color: #3c0e0e;
--flow-dialog-btn-padding: 10px 16px;
--flow-menu-item-selected-color: var(--flow-color);
--flow-checkbox-checked-color: white;
--flow-checkbox-checked-color: #3c0e0e;
}

[row] {
Expand Down