Skip to content

Commit d5ee589

Browse files
Dee297klassare
Dee297
authored and
klassare
committed
1.3.1 mainnet (#25)
* fix in error pipe * fix undelegation * fix bug in file export * small fix for op decode preview * voting dashboard * bakers info * bakers list * Voting dashboard * fix for scrollbars * set mainnet * add roll count to bakers-list * code for nxt voting period * added columns for bakers list * bakers-list minor edit * fix USD price * fix for testing vote * add sorting in bakers list * add show all to bakers list * fix sorting for empty names * supermajority info * added Angular Material and sort module * fix issue #23 * hide toggle * fix bug in import service * fix for promotion * fix getBallotVotes * fix toggle * add 2 new public bakers * Athens * change public node * Revert "Athens" This reverts commit 5c54f40. * Revert "Revert "Athens"" This reverts commit 1f0c362. * Revert "change public node" This reverts commit 8b9e21c. * fix manager_pubkey * faster KT import * fix tests for TzrateService * fix BalanceService tests * add test for v2 encryption * update error pipe * add custom gas/storage limits for transfer * update version to 1.3.1 * baker list update
1 parent e2a244e commit d5ee589

File tree

171 files changed

+4338
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+4338
-322
lines changed

‎package-lock.json

Lines changed: 89 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "kukai",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",
@@ -24,12 +24,14 @@
2424
},
2525
"private": true,
2626
"dependencies": {
27-
"@angular/animations": "^5.2.0",
27+
"@angular/animations": "^5.2.11",
28+
"@angular/cdk": "^5.2.5",
2829
"@angular/common": "^5.2.0",
2930
"@angular/compiler": "^5.2.0",
3031
"@angular/core": "^5.2.0",
3132
"@angular/forms": "^5.2.0",
3233
"@angular/http": "^5.2.0",
34+
"@angular/material": "^5.2.5",
3335
"@angular/platform-browser": "^5.2.0",
3436
"@angular/platform-browser-dynamic": "^5.2.0",
3537
"@angular/router": "^5.2.0",
@@ -45,6 +47,7 @@
4547
"bs58": "^4.0.1",
4648
"bs58check": "^2.1.1",
4749
"buffer": "^5.0.7",
50+
"chart.js": "^2.7.3",
4851
"codecov": "^2.3.1",
4952
"copy-to-clipboard": "^3.0.8",
5053
"core-js": "^2.4.1",

‎src/app/app-routing.module.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ import { AccountComponent } from './components/account/account.component';
1616
import { MnemonicImportComponent } from './components/mnemonic-import/mnemonic-import.component';
1717
import { BakeryComponent } from './components/bakery/bakery.component';
1818
import { ActivateComponent } from './components/activate/activate.component';
19+
import { VotingComponent } from './components/voting/voting.component';
20+
import { CommunityComponent } from './components/community/community.component';
21+
import { BakersListComponent } from './components/bakers-list/bakers-list.component';
1922

2023
const routes: Routes = [
2124
{ path: '', component: StartComponent }, // Content Centre position
@@ -32,7 +35,10 @@ const routes: Routes = [
3235
{ path: 'delegate', component: DelegateComponent },
3336
{ path: 'account', component: AccountComponent },
3437
{ path: 'bakery', component: BakeryComponent },
35-
{ path: 'activate', component: ActivateComponent }
38+
{ path: 'activate', component: ActivateComponent },
39+
{ path: 'voting', component: VotingComponent },
40+
{ path: 'community', component: CommunityComponent },
41+
{ path: 'bakers-list', component: BakersListComponent }
3642
];
3743

3844
@NgModule({

‎src/app/app.module.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ import { HttpClientModule, HttpClient } from '@angular/common/http';
55
import { AppRoutingModule } from './app-routing.module';
66
import { BsModalService } from 'ngx-bootstrap/modal';
77

8+
// From Angular Material
9+
import { MatSortModule } from '@angular/material';
10+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
11+
12+
813
// For translation
914
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
1015
import {TranslateHttpLoader} from '@ngx-translate/http-loader';
@@ -51,6 +56,9 @@ import { OperationService } from './services/operation.service';
5156
import { BakeryComponent } from './components/bakery/bakery.component';
5257
import { ActivateComponent } from './components/activate/activate.component';
5358
import { MessagesComponent } from './components/messages/messages.component'; // Empty
59+
import { VotingComponent } from './components/voting/voting.component';
60+
import { CommunityComponent } from './components/community/community.component';
61+
import { BakersListComponent } from './components/bakers-list/bakers-list.component';
5462

5563
// Pipes
5664
import { ErrorHandlingPipe } from './pipes/error-handling.pipe';
@@ -87,6 +95,9 @@ export function HttpLoaderFactory(http: HttpClient) {
8795
BakeryComponent,
8896
ActivateComponent,
8997
MessagesComponent, // Empty
98+
VotingComponent,
99+
CommunityComponent,
100+
BakersListComponent,
90101

91102
// Pipes
92103
ErrorHandlingPipe,
@@ -96,6 +107,8 @@ export function HttpLoaderFactory(http: HttpClient) {
96107
],
97108
imports: [
98109
BrowserModule,
110+
BrowserAnimationsModule,
111+
MatSortModule,
99112
FormsModule,
100113
AppRoutingModule,
101114
HttpClientModule,

‎src/app/components/bakers-list/bakers-list.component.html

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<!--
2+
<div class="container" *ngIf="this.walletService.wallet">
3+
-->
4+
<div class="container">
5+
<!-- Title -->
6+
<div class="row bottom-separator">
7+
<div class="col-lg-12">
8+
<h1 class="page-header"> Bakers List </h1>
9+
</div>
10+
</div>
11+
12+
<!-- Subheading -->
13+
<div class="row row-subheading">
14+
<div class="col-lg-12">
15+
<h4>
16+
<p>Here, you can easily view the public bakers vote and participation</p>
17+
</h4>
18+
</div>
19+
</div>
20+
21+
<br>
22+
23+
<button type="button" class="btn btn-outline-light btn-sm btn-balance show-more" aria-label="More" (click)="toggleShowAll()">
24+
{{ showBtn }}
25+
</button>
26+
27+
<br>
28+
29+
<div class="tableSection">
30+
<div class="table-responsive">
31+
<table class="table" matSort (matSortChange)="sortData($event)">
32+
<thead>
33+
<tr>
34+
<th scope="col" mat-sort-header="name"> Name </th>
35+
<th scope="col" mat-sort-header="roll"> Rolls </th>
36+
<th scope="col"> Identity </th>
37+
<th scope="col" *ngIf="this.showColumn.Proposal"> Proposal Period </th>
38+
<th scope="col" *ngIf="this.showColumn.Exploration"> Exploration </th>
39+
<th scope="col" *ngIf="this.showColumn.Testing"> Testing </th>
40+
<th scope="col" *ngIf="this.showColumn.Promotion"> Promotion </th>
41+
<!-- <th scope="col">‰</th> --
42+
<th scope="col" mat-sort-header="identity"> Identity </th>
43+
<th scope="col" mat-sort-header="proposal" *ngIf="this.showColumn.Proposal"> Proposal Period </th>
44+
<th scope="col" mat-sort-header="exploration" *ngIf="this.showColumn.Exploration"> Exploration </th>
45+
<th scope="col" mat-sort-header="testing" *ngIf="this.showColumn.Testing"> Testing </th>
46+
<th scope="col" mat-sort-header="promotion" *ngIf="this.showColumn.Promotion"> Promotion </th>
47+
-->
48+
</tr>
49+
</thead>
50+
<tbody>
51+
<ng-container *ngFor="let baker of bakersList">
52+
<tr *ngIf="baker.baker_name || showAll">
53+
<td>
54+
<img *ngIf="baker.image" [src]="baker.image" alt="Baker image" height="21" width="21"> {{ baker.baker_name }}
55+
</td>
56+
<td> {{ baker.rolls }} </td>
57+
<!-- <td> {{ baker.rolls / currentParticipation.total_votes * 1000 | number:'1.0-2' }} ‰ </td> -->
58+
<td> {{ baker.identity }} </td>
59+
<td *ngIf="this.showColumn.Proposal"> {{ baker.vote }} </td>
60+
<td *ngIf="this.showColumn.Exploration"> {{ baker.vote2 }} </td>
61+
<td *ngIf="this.showColumn.Testing"> </td>
62+
<td *ngIf="this.showColumn.Promotion"> {{ baker.vote3 }} </td>
63+
</tr>
64+
</ng-container>
65+
</tbody>
66+
</table>
67+
</div>
68+
</div>
69+
70+
<br>
71+
72+
<!--
73+
<input type="checkbox" (change)="toggleShowAll()"> Show all
74+
<div class="tableSection" *ngIf="bakersList">
75+
<div class="table-responsive">
76+
<table class="table">
77+
<thead>
78+
<tr>
79+
<th scope="col" class="column-sort" (click)="sortName()">Name &#9660;</th>
80+
<th scope="col" class="column-sort" (click)="sortRolls()">Rolls &#9660;</th>
81+
<!-- <th scope="col">‰</th> --
82+
<th scope="col">Identity</th>
83+
<th scope="col" *ngIf="this.showColumn.Proposal">Proposal Period</th>
84+
<th scope="col" *ngIf="this.showColumn.Exploration">Exploration</th>
85+
<th scope="col" *ngIf="this.showColumn.Testing">Testing</th>
86+
<th scope="col" *ngIf="this.showColumn.Promotion">Promotion</th>
87+
</tr>
88+
</thead>
89+
<tbody>
90+
<ng-container *ngFor="let baker of bakersList">
91+
<tr *ngIf="baker.baker_name || showAll">
92+
<td>
93+
<img *ngIf="baker.image" [src]="baker.image" alt="Baker image" height="21" width="21"> {{ baker.baker_name }}
94+
</td>
95+
<td> {{ baker.rolls }} </td>
96+
<!-- <td> {{ baker.rolls / currentParticipation.total_votes * 1000 | number:'1.0-2' }} ‰ </td> --
97+
<td> {{ baker.identity }} </td>
98+
<td *ngIf="this.showColumn.Proposal"> {{ baker.vote }} </td>
99+
<td *ngIf="this.showColumn.Exploration"> {{ baker.vote2 }} </td>
100+
<td *ngIf="this.showColumn.Testing"> </td>
101+
<td *ngIf="this.showColumn.Promotion"> </td>
102+
</tr>
103+
</ng-container>
104+
</tbody>
105+
</table>
106+
</div>
107+
</div>
108+
-->
109+
</div>
110+
111+
<!-- Default message - No account created --
112+
<div class="container" *ngIf="!this.walletService.wallet">
113+
<div class="row bottom-separator-no-account">
114+
<div class="col-lg-12">
115+
<h1 class="page-header-no-account"> Votes for Protocol amendments proposals </h1>
116+
</div>
117+
</div>
118+
<div class="row">
119+
<div class="col-lg-12">
120+
<p>
121+
Connect to your wallet and inform your baker of your preferred choice via tezvote's smart-contract.
122+
</p>
123+
</div>
124+
</div>
125+
</div>
126+
-->

0 commit comments

Comments
 (0)