Merge pull request #217 from qubic/refactor/remove-voting-feature

Author: sallymoc

src/app/app-routing.module.ts

@@ -4,14 +4,10 @@ import { BalanceComponent } from './balance/balance.component';
 import { MainComponent } from './main/main.component';
 import { SettingsComponent } from './settings/settings.component';
 import { PaymentComponent } from './payment/payment.component';
-import { VotingComponent } from './voting/voting.component';
-import { VotingParticipateComponent } from './voting/participate/voting-participate.component';
-import { VotingCreateComponent } from './voting/create/voting-create.component';
 import { IpoComponent } from './ipo/ipo.component';
 import { PlaceBidComponent } from './ipo/place-bid/place-bid.component';
 import { AssetsComponent } from './assets/assets.component';
 import { TransferRightsComponent } from './assets/transfer-rights/transfer-rights.component';
-import { NavigationComponent } from './navigation/navigation.component';
 import { WelcomeComponent } from './public/welcome/welcome.component';
 import { CreateVaultComponent } from './public/create-vault/create-vault.component';
 import { walletReadyGuard } from './guards/wallet-ready.guard';
@@ -61,22 +57,6 @@ const routes: Routes = [
     path     : 'qearn',
     component: QearnComponent
   },
-  {
-    path     : 'voting',
-    component: VotingComponent
-  },
-  {
-    path     : 'voting/create',
-    component: VotingCreateComponent
-  },
-  {
-    path     : 'voting/create/:computorId',
-    component: VotingCreateComponent
-  },
-  {
-    path     : 'voting/participate/:index',
-    component: VotingParticipateComponent
-  },
   {
     path     : 'settings',
     component: SettingsComponent

src/app/app.module.ts

@@ -55,11 +55,7 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { AccountComponent } from './settings/account/account.component';
 import { ExportComponent } from './settings/export/export.component';
 import { NgxFileDropModule } from 'ngx-file-drop';
-import { VotingComponent } from './voting/voting.component';
-import { VotingParticipateComponent } from './voting/participate/voting-participate.component';
-import { VotingCreateComponent } from './voting/create/voting-create.component';
 import { MatStepperModule } from '@angular/material/stepper';
-import { VotingStatusComponent } from './voting/voting-status/voting-status.component';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { IpoComponent } from './ipo/ipo.component';
 import { PlaceBidComponent } from './ipo/place-bid/place-bid.component';
@@ -130,10 +126,6 @@ export const httpInterceptorProviders = [{ provide: HTTP_INTERCEPTORS, useClass:
     LanguageChooserComponent,
     AccountComponent,
     ExportComponent,
-    VotingComponent,
-    VotingParticipateComponent,
-    VotingCreateComponent,
-    VotingStatusComponent,
     IpoComponent,
     PlaceBidComponent,
     TransferStatusComponent,

src/app/assets/assets.component.html

@@ -314,7 +314,7 @@ <h2>{{ t("assetsComponent.form.info") }}</h2>
                 {{ t("assetsComponent.form.buttons.cancel") }}
               </button>
               <button *ngIf="!walletService.privateKey" mat-raised-button color="primary" type="button"
-                (click)="loadKey()">{{ t("votingComponent.create.buttons.loadPrivateKey") }}
+                (click)="loadKey()">{{ t("paymentComponent.buttons.loadPrivateKey") }}
               </button>
               <button *ngIf="walletService.privateKey" mat-raised-button color="primary" type="submit"
                 [disabled]="!sendForm.valid || getBalanceAfterFees() < 0">

src/app/navigation/navigation.component.html

@@ -88,8 +88,6 @@
               class="icon-color-link icon">toll</mat-icon>{{ t('general.navigation.qearn') }}</a>
           <a mat-list-item routerLink="assets-area" (click)="checkMobileToggle()" [class.selected-nav]="isAssetsSelected"><mat-icon
               class="icon-color-link icon">category</mat-icon>{{ t("general.navigation.assets") }}</a>
-          <!-- <a mat-list-item routerLink="voting" (click)="checkMobileToggle()" [class.selected-nav]="isVotingSelected"><mat-icon
-              class="icon-color-link icon">how_to_vote</mat-icon>{{ t("general.navigation.voting") }}</a> -->
           <a mat-list-item routerLink="ipo" (click)="checkMobileToggle()" [class.selected-nav]="isIpoSelected"><mat-icon
               class="icon-color-link icon">multiline_chart</mat-icon>{{ t("general.navigation.ipo") }}<span *ngIf="activeIpoCount > 0" class="nav-badge">{{ activeIpoCount }}</span></a>
           <a mat-list-item routerLink="settings" (click)="checkMobileToggle()" [class.selected-nav]="isSettingsSelected"><mat-icon

src/app/navigation/navigation.component.ts

@@ -65,7 +65,6 @@ export class NavigationComponent implements OnInit, OnDestroy {
   public isBalanceSelected = false;
   public isQearnSelected = false;
   public isAssetsSelected = false;
-  public isVotingSelected = false;
   public isIpoSelected = false;
   public activeIpoCount = 0;
   private destroy$ = new Subject<void>();
@@ -97,7 +96,6 @@ export class NavigationComponent implements OnInit, OnDestroy {
         this.isQearnSelected = currentUrl === '/qearn';
         this.isBalanceSelected = currentUrl === '/balance';
         this.isAssetsSelected = currentUrl === '/assets-area';
-        this.isVotingSelected = currentUrl === '/voting';
         this.isIpoSelected = currentUrl === '/ipo';
         this.isSettingsSelected = currentUrl === '/settings';
 

src/app/services/api.model.ts

@@ -93,58 +93,6 @@ export interface MarketInformation {
   currency: string
 }
 
-export interface BallotDto {
-  computorIndex?: number;
-  computorId?: string | null;
-  shortCode?: string | null;
-  vote?: number;
-}
-
-export interface ProposalDto {
-  status: number;
-  url?: string | null;
-  computorIndex?: number;
-  shortCode?: string | null;
-  computorId: string;
-  ballots?: Array<BallotDto> | null;
-  readonly resultSummary?: { [key: string]: Array<BallotDto>; } | null;
-  readonly mostVotes?: number;
-  readonly sumOption1?: number;
-  readonly sumOption2?: number;
-  readonly sumOption3?: number;
-  readonly sumOption4?: number;
-  readonly sumOption5?: number;
-  readonly sumOption6?: number;
-  readonly sumOption7?: number;
-  readonly isPublished: boolean;
-  title?: string | null;
-  description?: string | null;
-  options?: string | null;
-  readonly hasVotes?: boolean;
-  published: Date | null;
-  publishedTick: number | null;
-  tickForPublish: number;
-}
-
-export interface ProposalCreateRequest {
-  computorId: string | null;
-  title: string | null;
-  description: string | null;
-  option1: string | null;
-  option2: string | null;
-  option3?: string | null;
-  option4?: string | null;
-  option5?: string | null;
-  option6?: string | null;
-  option7?: string | null;
-}
-export interface ProposalCreateResponse {
-  url: string;
-  id: string;
-  computorIndex: number;
-  currentProtocol: number;
-}
-
 export interface ContractDto {
   id: string;
   index: number;

src/app/services/api.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AuthResponse, BalanceResponse, ContractDto, CurrentTickResponse, MarketInformation, NetworkBalance, PeerDto, ProposalCreateRequest, ProposalCreateResponse, ProposalDto, QubicAsset, SmartContract, SubmitTransactionRequest, SubmitTransactionResponse, Transaction } from './api.model';
+import { AuthResponse, BalanceResponse, ContractDto, CurrentTickResponse, MarketInformation, NetworkBalance, PeerDto, QubicAsset, SmartContract, SubmitTransactionRequest, SubmitTransactionResponse, Transaction } from './api.model';
 import {
   HttpClient, HttpHeaders, HttpParams,
   HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
@@ -17,7 +17,6 @@ import { WalletService } from './wallet.service';
 })
 export class ApiService {
 
-  public currentProposals: BehaviorSubject<ProposalDto[]> = new BehaviorSubject<ProposalDto[]>([]);
   public currentIpoContracts: BehaviorSubject<ContractDto[]> = new BehaviorSubject<ContractDto[]>([]);
   public currentPeerList: BehaviorSubject<PeerDto[]> = new BehaviorSubject<PeerDto[]>([]);
   public currentProtocol: BehaviorSubject<number> = new BehaviorSubject<number>(0);
@@ -175,22 +174,6 @@ export class ApiService {
     }));
   }
 
-  public getProposals() {
-    let localVarPath = `/Voting/Proposal`;
-    return this.httpClient.request<ProposalDto[]>('get', `${this.basePath}${localVarPath}`,
-      {
-        context: new HttpContext(),
-        headers: {
-          "Content-Type": "application/json"
-        },
-        responseType: 'json'
-      }
-    ).pipe(map((p) => {
-      this.currentProposals.next(p);
-      return p;
-    }));
-  }
-
   public getIpoContracts() {
     let localVarPath = `/Wallet/IpoContracts`;
     return this.httpClient.request<ContractDto[]>('get', `${this.basePath}${localVarPath}`,
@@ -207,33 +190,6 @@ export class ApiService {
     }));
   }
 
-  public submitProposalCreateRequest(proposal: ProposalCreateRequest) {
-    let localVarPath = `/Voting/Proposal`;
-    return this.httpClient.request<ProposalCreateResponse>('post', `${this.basePath}${localVarPath}`,
-      {
-        context: new HttpContext(),
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: proposal,
-        responseType: 'json'
-      }
-    );
-  }
-
-  public submitProposalPublished(proposalId: string) {
-    let localVarPath = `/Voting/Proposal/` + proposalId + "/publish";
-    return this.httpClient.request<ProposalCreateResponse>('post', `${this.basePath}${localVarPath}`,
-      {
-        context: new HttpContext(),
-        headers: {
-          "Content-Type": "application/json"
-        },
-        responseType: 'json'
-      }
-    );
-  }
-
   public getPeerList() {
     let localVarPath = `/Public/Peers`;
     return this.httpClient.request<PeerDto[]>('get', `${this.basePath}${localVarPath}`,

src/app/services/apis/static/qubic-static.model.ts

@@ -18,7 +18,6 @@ export interface StaticSmartContract {
   address: string;
   procedures: SmartContractProcedure[];
   website?: string;
-  proposalUrl?: string;
 }
 
 export interface GetSmartContractsResponse {