mirror of
https://github.com/mempool/mempool.git
synced 2026-08-13 12:33:11 +02:00
Merge pull request #6565 from mempool/rodribp/remove-indexing-blocks-badge
fix: remove indexing block's badge from unnecesary graphs
This commit is contained in:
commit
69e2d83f07
19 changed files with 29 additions and 21 deletions
|
|
@ -1,4 +1,3 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
|
||||||
|
|
||||||
<div [class.full-container]="!widget">
|
<div [class.full-container]="!widget">
|
||||||
<div *ngIf="!widget" class="card-header mb-0 mb-md-4">
|
<div *ngIf="!widget" class="card-header mb-0 mb-md-4">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
|
||||||
|
|
||||||
<div [class.full-container]="!widget">
|
<div [class.full-container]="!widget">
|
||||||
<ng-container *ngIf="!error">
|
<ng-container *ngIf="!error">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
<app-indexing-progress *ngIf="!widget" [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div [class.full-container]="!widget">
|
<div [class.full-container]="!widget">
|
||||||
<div *ngIf="!widget" class="card-header mb-0 mb-md-4">
|
<div *ngIf="!widget" class="card-header mb-0 mb-md-4">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress></app-indexing-progress>
|
<app-indexing-progress [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="full-container">
|
<div class="full-container">
|
||||||
<div class="card-header mb-0 mb-md-4">
|
<div class="card-header mb-0 mb-md-4">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress></app-indexing-progress>
|
<app-indexing-progress [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="full-container">
|
<div class="full-container">
|
||||||
<div class="card-header mb-0 mb-md-4">
|
<div class="card-header mb-0 mb-md-4">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress></app-indexing-progress>
|
<app-indexing-progress [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="full-container">
|
<div class="full-container">
|
||||||
<div class="card-header mb-0 mb-md-4">
|
<div class="card-header mb-0 mb-md-4">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress></app-indexing-progress>
|
<app-indexing-progress [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="full-container">
|
<div class="full-container">
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
<app-indexing-progress [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="full-container">
|
<div class="full-container">
|
||||||
|
|
||||||
<div class="card-header mb-0 mb-md-4">
|
<div class="card-header mb-0 mb-md-4">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
<app-indexing-progress *ngIf="!widget" [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget, 'legacy': !isMempoolModule}">
|
<div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget, 'legacy': !isMempoolModule}">
|
||||||
<div *ngIf="!widget" class="float-start" style="display: flex; width: 100%; align-items: center;">
|
<div *ngIf="!widget" class="float-start" style="display: flex; width: 100%; align-items: center;">
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<app-loading-indicator [name]="'block-indexing'" i18n-label label="Indexing blocks"></app-loading-indicator>
|
<app-loading-indicator *ngIf="showBlocks" [name]="'block-indexing'" i18n-label label="Indexing blocks"></app-loading-indicator>
|
||||||
<app-loading-indicator [name]="'daily-hashrate-indexing'" i18n-label label="Indexing network hashrate"></app-loading-indicator>
|
<app-loading-indicator *ngIf="showNetworkHashrate" [name]="'daily-hashrate-indexing'" i18n-label label="Indexing network hashrate"></app-loading-indicator>
|
||||||
<app-loading-indicator [name]="'weekly-hashrate-indexing'" i18n-label label="Indexing pools hashrate"></app-loading-indicator>
|
<app-loading-indicator *ngIf="showPoolsHashrate" [name]="'weekly-hashrate-indexing'" i18n-label label="Indexing pools hashrate"></app-loading-indicator>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,23 @@
|
||||||
.sticky-loading {
|
:host {
|
||||||
position: absolute;
|
position: fixed;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 4px;
|
||||||
|
|
||||||
@media (width >= 992px) {
|
@media (width >= 992px) {
|
||||||
left: 32px;
|
left: 32px;
|
||||||
top: 55px;
|
top: 55px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (576px <= width < 992px ) {
|
@media (576px <= width < 992px ) {
|
||||||
left: 18px;
|
left: 18px;
|
||||||
top: 55px;
|
top: 55px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (width <= 575px) {
|
@media (width <= 575px) {
|
||||||
left: 18px;
|
left: 18px;
|
||||||
top: 100px;
|
top: 100px;
|
||||||
|
|
@ -1,12 +1,17 @@
|
||||||
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-indexing-progress',
|
selector: 'app-indexing-progress',
|
||||||
templateUrl: './indexing-progress.component.html',
|
templateUrl: './indexing-progress.component.html',
|
||||||
|
styleUrl: 'indexing-progress.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
standalone: false,
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class IndexingProgressComponent implements OnInit {
|
export class IndexingProgressComponent implements OnInit {
|
||||||
|
@Input() showBlocks: boolean = true;
|
||||||
|
@Input() showNetworkHashrate: boolean = true;
|
||||||
|
@Input() showPoolsHashrate: boolean = true;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div *ngIf="this.indexingProgress$ | async as progress" class="sticky-loading">
|
<div *ngIf="this.indexingProgress$ | async as progress">
|
||||||
<span *ngIf="progress >= 0" class="me-auto badge rounded-pill bg-warning">{{ this.label }} ({{ progress }}%)</span>
|
<span *ngIf="progress >= 0" class="me-auto badge rounded-pill bg-warning">{{ this.label }} ({{ progress }}%)</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -7,7 +7,6 @@ import { WebsocketService } from '@app/services/websocket.service';
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-loading-indicator',
|
selector: 'app-loading-indicator',
|
||||||
templateUrl: './loading-indicator.component.html',
|
templateUrl: './loading-indicator.component.html',
|
||||||
styleUrls: ['./loading-indicator.component.scss'],
|
|
||||||
standalone: false,
|
standalone: false,
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
<app-indexing-progress *ngIf="!widget" [showNetworkHashrate]="false" [showPoolsHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div [class]="widget === false ? 'full-container' : ''">
|
<div [class]="widget === false ? 'full-container' : ''">
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<app-indexing-progress></app-indexing-progress>
|
<app-indexing-progress [showNetworkHashrate]="false"></app-indexing-progress>
|
||||||
|
|
||||||
<div class="container-xl" *ngIf="!error; else errorTemplate">
|
<div class="container-xl" *ngIf="!error; else errorTemplate">
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
|
||||||
|
|
||||||
<div [class]="widget === false ? 'full-container' : ''">
|
<div [class]="widget === false ? 'full-container' : ''">
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
|
||||||
|
|
||||||
<div [class.full-container]="!widget">
|
<div [class.full-container]="!widget">
|
||||||
<ng-container *ngIf="!error">
|
<ng-container *ngIf="!error">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
|
|
||||||
|
|
||||||
<div [class.full-container]="!widget">
|
<div [class.full-container]="!widget">
|
||||||
<ng-container *ngIf="!error">
|
<ng-container *ngIf="!error">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue