Skip to content

Commit

Permalink
1.3.1 mainnet (#25)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Dee297 authored and klassare committed Jun 23, 2019
1 parent e2a244e commit d5ee589
Show file tree
Hide file tree
Showing 171 changed files with 4,338 additions and 322 deletions.
188 changes: 89 additions & 99 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kukai",
"version": "1.3.0",
"version": "1.3.1",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand All @@ -24,12 +24,14 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^5.2.0",
"@angular/animations": "^5.2.11",
"@angular/cdk": "^5.2.5",
"@angular/common": "^5.2.0",
"@angular/compiler": "^5.2.0",
"@angular/core": "^5.2.0",
"@angular/forms": "^5.2.0",
"@angular/http": "^5.2.0",
"@angular/material": "^5.2.5",
"@angular/platform-browser": "^5.2.0",
"@angular/platform-browser-dynamic": "^5.2.0",
"@angular/router": "^5.2.0",
Expand All @@ -45,6 +47,7 @@
"bs58": "^4.0.1",
"bs58check": "^2.1.1",
"buffer": "^5.0.7",
"chart.js": "^2.7.3",
"codecov": "^2.3.1",
"copy-to-clipboard": "^3.0.8",
"core-js": "^2.4.1",
Expand Down
8 changes: 7 additions & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import { AccountComponent } from './components/account/account.component';
import { MnemonicImportComponent } from './components/mnemonic-import/mnemonic-import.component';
import { BakeryComponent } from './components/bakery/bakery.component';
import { ActivateComponent } from './components/activate/activate.component';
import { VotingComponent } from './components/voting/voting.component';
import { CommunityComponent } from './components/community/community.component';
import { BakersListComponent } from './components/bakers-list/bakers-list.component';

const routes: Routes = [
{ path: '', component: StartComponent }, // Content Centre position
Expand All @@ -32,7 +35,10 @@ const routes: Routes = [
{ path: 'delegate', component: DelegateComponent },
{ path: 'account', component: AccountComponent },
{ path: 'bakery', component: BakeryComponent },
{ path: 'activate', component: ActivateComponent }
{ path: 'activate', component: ActivateComponent },
{ path: 'voting', component: VotingComponent },
{ path: 'community', component: CommunityComponent },
{ path: 'bakers-list', component: BakersListComponent }
];

@NgModule({
Expand Down
13 changes: 13 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import { HttpClientModule, HttpClient } from '@angular/common/http';
import { AppRoutingModule } from './app-routing.module';
import { BsModalService } from 'ngx-bootstrap/modal';

// From Angular Material
import { MatSortModule } from '@angular/material';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';


// For translation
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
import {TranslateHttpLoader} from '@ngx-translate/http-loader';
Expand Down Expand Up @@ -51,6 +56,9 @@ import { OperationService } from './services/operation.service';
import { BakeryComponent } from './components/bakery/bakery.component';
import { ActivateComponent } from './components/activate/activate.component';
import { MessagesComponent } from './components/messages/messages.component'; // Empty
import { VotingComponent } from './components/voting/voting.component';
import { CommunityComponent } from './components/community/community.component';
import { BakersListComponent } from './components/bakers-list/bakers-list.component';

// Pipes
import { ErrorHandlingPipe } from './pipes/error-handling.pipe';
Expand Down Expand Up @@ -87,6 +95,9 @@ export function HttpLoaderFactory(http: HttpClient) {
BakeryComponent,
ActivateComponent,
MessagesComponent, // Empty
VotingComponent,
CommunityComponent,
BakersListComponent,

// Pipes
ErrorHandlingPipe,
Expand All @@ -96,6 +107,8 @@ export function HttpLoaderFactory(http: HttpClient) {
],
imports: [
BrowserModule,
BrowserAnimationsModule,
MatSortModule,
FormsModule,
AppRoutingModule,
HttpClientModule,
Expand Down
126 changes: 126 additions & 0 deletions src/app/components/bakers-list/bakers-list.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<!--
<div class="container" *ngIf="this.walletService.wallet">
-->
<div class="container">
<!-- Title -->
<div class="row bottom-separator">
<div class="col-lg-12">
<h1 class="page-header"> Bakers List </h1>
</div>
</div>

<!-- Subheading -->
<div class="row row-subheading">
<div class="col-lg-12">
<h4>
<p>Here, you can easily view the public bakers vote and participation</p>
</h4>
</div>
</div>

<br>

<button type="button" class="btn btn-outline-light btn-sm btn-balance show-more" aria-label="More" (click)="toggleShowAll()">
{{ showBtn }}
</button>

<br>

<div class="tableSection">
<div class="table-responsive">
<table class="table" matSort (matSortChange)="sortData($event)">
<thead>
<tr>
<th scope="col" mat-sort-header="name"> Name </th>
<th scope="col" mat-sort-header="roll"> Rolls </th>
<th scope="col"> Identity </th>
<th scope="col" *ngIf="this.showColumn.Proposal"> Proposal Period </th>
<th scope="col" *ngIf="this.showColumn.Exploration"> Exploration </th>
<th scope="col" *ngIf="this.showColumn.Testing"> Testing </th>
<th scope="col" *ngIf="this.showColumn.Promotion"> Promotion </th>
<!-- <th scope="col">‰</th> --
<th scope="col" mat-sort-header="identity"> Identity </th>
<th scope="col" mat-sort-header="proposal" *ngIf="this.showColumn.Proposal"> Proposal Period </th>
<th scope="col" mat-sort-header="exploration" *ngIf="this.showColumn.Exploration"> Exploration </th>
<th scope="col" mat-sort-header="testing" *ngIf="this.showColumn.Testing"> Testing </th>
<th scope="col" mat-sort-header="promotion" *ngIf="this.showColumn.Promotion"> Promotion </th>
-->
</tr>
</thead>
<tbody>
<ng-container *ngFor="let baker of bakersList">
<tr *ngIf="baker.baker_name || showAll">
<td>
<img *ngIf="baker.image" [src]="baker.image" alt="Baker image" height="21" width="21"> {{ baker.baker_name }}
</td>
<td> {{ baker.rolls }} </td>
<!-- <td> {{ baker.rolls / currentParticipation.total_votes * 1000 | number:'1.0-2' }} ‰ </td> -->
<td> {{ baker.identity }} </td>
<td *ngIf="this.showColumn.Proposal"> {{ baker.vote }} </td>
<td *ngIf="this.showColumn.Exploration"> {{ baker.vote2 }} </td>
<td *ngIf="this.showColumn.Testing"> </td>
<td *ngIf="this.showColumn.Promotion"> {{ baker.vote3 }} </td>
</tr>
</ng-container>
</tbody>
</table>
</div>
</div>

<br>

<!--
<input type="checkbox" (change)="toggleShowAll()"> Show all
<div class="tableSection" *ngIf="bakersList">
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th scope="col" class="column-sort" (click)="sortName()">Name &#9660;</th>
<th scope="col" class="column-sort" (click)="sortRolls()">Rolls &#9660;</th>
<!-- <th scope="col">‰</th> --
<th scope="col">Identity</th>
<th scope="col" *ngIf="this.showColumn.Proposal">Proposal Period</th>
<th scope="col" *ngIf="this.showColumn.Exploration">Exploration</th>
<th scope="col" *ngIf="this.showColumn.Testing">Testing</th>
<th scope="col" *ngIf="this.showColumn.Promotion">Promotion</th>
</tr>
</thead>
<tbody>
<ng-container *ngFor="let baker of bakersList">
<tr *ngIf="baker.baker_name || showAll">
<td>
<img *ngIf="baker.image" [src]="baker.image" alt="Baker image" height="21" width="21"> {{ baker.baker_name }}
</td>
<td> {{ baker.rolls }} </td>
<!-- <td> {{ baker.rolls / currentParticipation.total_votes * 1000 | number:'1.0-2' }} ‰ </td> --
<td> {{ baker.identity }} </td>
<td *ngIf="this.showColumn.Proposal"> {{ baker.vote }} </td>
<td *ngIf="this.showColumn.Exploration"> {{ baker.vote2 }} </td>
<td *ngIf="this.showColumn.Testing"> </td>
<td *ngIf="this.showColumn.Promotion"> </td>
</tr>
</ng-container>
</tbody>
</table>
</div>
</div>
-->
</div>

<!-- Default message - No account created --
<div class="container" *ngIf="!this.walletService.wallet">
<div class="row bottom-separator-no-account">
<div class="col-lg-12">
<h1 class="page-header-no-account"> Votes for Protocol amendments proposals </h1>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<p>
Connect to your wallet and inform your baker of your preferred choice via tezvote's smart-contract.
</p>
</div>
</div>
</div>
-->
Loading

0 comments on commit d5ee589

Please sign in to comment.