Merge branch 'master' into simon/angular-universal
* master: Tweak ASM opcode styling colors Add some color and styling to the Bitcoin ASM opcodes Correcting title text on graph invert button. Modify upgrade script to include "tag @ hash" in notification msg Adding a button to invert the graph globally. Display P2PK instead of OP_RETURN fixes #161 Improved utxo script design. fixes #46 Adding prevout script. Fixed padding. refs #46 Correcting details button padding on mobile. Fix nginx.conf reverse proxy cache URL path for sponsor images Add missing "engines" metadata into package-lock.json Upgrade backend/package-lock.json to version 2 Toggle display UTXO details and scripts for transactions fixes #46 Axios error handle sponsor proxy requests. Replacing request.js with axios fixes #153 Add basic websocket error handler as emergency fix for site crashing # Conflicts: # frontend/src/app/services/storage.service.ts
This commit is contained in:
@@ -40,6 +40,7 @@
|
||||
<input ngbButton type="radio" [value]="'1y'" [routerLink]="['/graphs' | relativeUrl]" fragment="1y"> 1Y
|
||||
</label>
|
||||
</div>
|
||||
<button (click)="invertGraph()" class="btn btn-primary btn-sm ml-2 d-none d-md-inline"><fa-icon [icon]="['fas', 'exchange-alt']" [rotate]="90" [fixedWidth]="true" title="Invert"></fa-icon></button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
|
||||
@@ -12,6 +12,7 @@ import { ApiService } from '../../services/api.service';
|
||||
import * as Chartist from '@mempool/chartist';
|
||||
import { StateService } from 'src/app/services/state.service';
|
||||
import { SeoService } from 'src/app/services/seo.service';
|
||||
import { StorageService } from 'src/app/services/storage.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-statistics',
|
||||
@@ -33,6 +34,7 @@ export class StatisticsComponent implements OnInit {
|
||||
transactionsWeightPerSecondOptions: any;
|
||||
|
||||
radioGroupForm: FormGroup;
|
||||
inverted: boolean;
|
||||
|
||||
constructor(
|
||||
@Inject(LOCALE_ID) private locale: string,
|
||||
@@ -42,6 +44,7 @@ export class StatisticsComponent implements OnInit {
|
||||
private apiService: ApiService,
|
||||
private stateService: StateService,
|
||||
private seoService: SeoService,
|
||||
private storageService: StorageService,
|
||||
) {
|
||||
this.radioGroupForm = this.formBuilder.group({
|
||||
dateSpan: '2h'
|
||||
@@ -51,6 +54,7 @@ export class StatisticsComponent implements OnInit {
|
||||
ngOnInit() {
|
||||
this.seoService.setTitle('Graphs');
|
||||
this.stateService.networkChanged$.subscribe((network) => this.network = network);
|
||||
this.inverted = this.storageService.getValue('inverted-graph') === 'true';
|
||||
const isMobile = window.innerWidth <= 767.98;
|
||||
let labelHops = isMobile ? 48 : 24;
|
||||
|
||||
@@ -157,4 +161,9 @@ export class StatisticsComponent implements OnInit {
|
||||
series: [mempoolStats.map((stats) => stats.vbytes_per_second)],
|
||||
};
|
||||
}
|
||||
|
||||
invertGraph() {
|
||||
this.storageService.setValue('inverted-graph', !this.inverted);
|
||||
document.location.reload();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user