machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove 'on'/UI changes per feedback

Browse Source
This commit is contained in:
BitcoinMechanic 2024-09-22 14:46:53 -07:00
parent b90cd4c7e3
commit 4220f99477
No known key found for this signature in database
GPG Key ID: E952E584CA8C0F45
9 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/utils/bitcoin-script.ts
View File

@ -220,7 +220,8 @@ export function parseDATUMTemplateCreator(coinbaseRaw: string): string[] | null
const tagStart = tagLengthByte + 1;
const tags = bytes.slice(tagStart, tagStart + tagsLength);
const tagString = String.fromCharCode(...tags);
let tagString = String.fromCharCode(...tags);
tagString = tagString.replace('\x00', '');
return tagString.split('\x0f');
}

1
frontend/src/app/components/block/block.component.html
View File

@ -185,7 +185,6 @@
<div class="on-pool-container" *ngIf="block.extras.pool.minerNames != undefined && block.extras.pool.minerNames.length > 1 && block.extras.pool.minerNames[1] != ''; else centralisedPool">
{{ block.extras.pool.minerNames[1] }}
<div class="on-pool">
<span class="on-pool-text">on</span>
<img class="pool-logo" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
{{ block.extras.pool.name }}
</div>

6
frontend/src/app/components/block/block.component.scss
View File

@ -94,12 +94,6 @@ h1 {
border-radius: .25rem;
}
.on-pool-text {
font-weight: normal;
color: gray;
padding-inline-end: 4px;
}
.pool-logo {
width: 25px;
height: 25px;

21
frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
View File

@ -61,18 +61,21 @@
</div>
<div class="animated" *ngIf="block.extras?.pool != undefined && showPools">
<a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge" [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
<div class="on-pool-container" *ngIf="block.extras.pool.minerNames != undefined && block.extras.pool.minerNames.length > 1 && block.extras.pool.minerNames[1] != ''; else centralisedPool">
{{ block.extras.pool.minerNames[1] }}
<div class="on-pool">
<span class="on-pool-text">on</span>
<img class="pool-logo faded" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
<span class="on-pool-name-text">{{ block.extras.pool.name }}</span>
<div *ngIf="block.extras.pool.minerNames != undefined && block.extras.pool.minerNames.length > 1 && block.extras.pool.minerNames[1] != ''; else centralisedPool">
<div class="on-pool-container" *ngIf="block.height != markHeight; else selectedDecentralisedPool">
{{ block.extras.pool.minerNames[1] }}
<div class="on-pool">
<img class="pool-logo faded" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
<span class="on-pool-name-text">{{ block.extras.pool.name }}</span>
</div>
</div>
<ng-template #selectedDecentralisedPool>
<img class="pool-logo faded" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
{{ block.extras.pool.minerNames[1] }}
</ng-template>
</div>
<ng-template #centralisedPool>
<div class="pool-container">
<img class="pool-logo" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'"> {{ block.extras.pool.name }}
</div>
<img class="pool-logo" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'"> {{ block.extras.pool.name }}
</ng-template>
</a>
</div>

17
frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
View File

@ -19,12 +19,6 @@
pointer-events: none;
}
.on-pool-text {
font-weight: normal;
color: gray;
padding-inline-end: 4px;
}
.on-pool-name-text {
display: inline-block;
padding-top: 2px;
@ -42,10 +36,17 @@
}
.on-pool-container {
align-items: center;
position: relative;
top: -8px;
display: flex;
flex-direction: column;
}
.on-pool-container.selected {
top: 0px;
}
.pool-container {
margin-top: 12px;
}
@ -156,7 +157,7 @@
#arrow-up {
position: relative;
left: calc(var(--block-size) * 0.6);
top: calc(var(--block-size) * 1.38);
top: calc(var(--block-size) * 1.28);
width: 0;
height: 0;
border-left: calc(var(--block-size) * 0.2) solid transparent;
@ -186,7 +187,7 @@
.badge {
position: relative;
top: 8px;
top: 15px;
z-index: 101;
color: #FFF;
}

2
frontend/src/app/components/blockchain/blockchain.component.scss
View File

@ -14,7 +14,7 @@
}
.blockchain-wrapper {
height: 272px;
height: 260px;
-webkit-user-select: none; /* Safari */
-moz-user-select: none; /* Firefox */
-ms-user-select: none; /* IE10+/Edge */

1
frontend/src/app/components/transaction/transaction.component.html
View File

@ -687,7 +687,6 @@
<div class="on-pool-container" *ngIf="pool.minerNames != undefined && pool.minerNames.length > 1 && pool.minerNames[1] != ''; else centralisedPool">
{{ pool.minerNames[1] }}
<div class="on-pool">
<span class="on-pool-text">on</span>
<img class="pool-logo" [src]="'/resources/mining-pools/' + pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + pool.name + ' mining pool'">
{{ pool.name }}
</div>

6
frontend/src/app/components/transaction/transaction.component.scss
View File

@ -73,12 +73,6 @@
border-radius: .25rem;
}
.on-pool-text {
font-weight: normal;
color: gray;
padding-inline-end: 4px;
}
.pool-logo {
width: 25px;
height: 25px;

2
frontend/src/app/dashboard/dashboard.component.scss
View File

@ -1,6 +1,6 @@
.dashboard-container {
text-align: center;
margin-top: 1.0rem;
margin-top: 0.5rem;
.col {
margin-bottom: 1.5rem;
}