D3 | Set account quorum equal to iroha quorum (#232)

* style: fixes linter warnings * chore: removed quorum * feat: show correct number of pending txs
d3ledger · Oct 21, 2019 · 5ba0a30 · 5ba0a30
1 parent 0163245
commit 5ba0a30
Show file tree

Hide file tree

Showing 33 changed files with 229 additions and 112 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -4,7 +4,7 @@
 -->
 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 

diff --git a/src/components/Dashboard/DashboardChart.vue b/src/components/Dashboard/DashboardChart.vue
@@ -21,7 +21,9 @@
             :class="[portfolioChart.filter !== value ? 'chart_time-filter' : 'chart_time-filter selected']"
             @click="selectLabel(value)"
           >
-            <p class="chart_time-filter_value">{{ value }}</p>
+            <p class="chart_time-filter_value">
+              {{ value }}
+            </p>
           </div>
         </el-col>
       </el-row>

diff --git a/src/components/Dashboard/DashboardDonutChart.vue b/src/components/Dashboard/DashboardDonutChart.vue
@@ -7,7 +7,9 @@
     <el-row>
       <el-col :span="16">
         <div class="crypto_header">
-          <p class="crypto_header-title">Portfolio structure</p>
+          <p class="crypto_header-title">
+            Portfolio structure
+          </p>
         </div>
         <div class="list_crypto">
           <div class="list_crypto-content">
@@ -32,7 +34,7 @@
         :span="8"
         class="donut-chart"
       >
-        <donut-chart :data="filterPortfolio"/>
+        <donut-chart :data="filterPortfolio" />
       </el-col>
     </el-row>
   </el-card>

diff --git a/src/components/Dashboard/DashboardPage.vue b/src/components/Dashboard/DashboardPage.vue
@@ -4,8 +4,8 @@
 -->
 <template>
   <el-container
-    v-loading.fullscreen="isDashboardLoading"
     v-if="isDashboardLoading"
+    v-loading.fullscreen="isDashboardLoading"
   />
   <el-container v-else-if="hasNonEmptyWallets">
     <el-main class="column-fullheight">
@@ -17,7 +17,7 @@
           />
         </el-col>
         <el-col :span="8">
-          <dashboard-donut-chart :portfolio="portfolioPercent"/>
+          <dashboard-donut-chart :portfolio="portfolioPercent" />
         </el-col>
       </el-row>
       <el-row>
@@ -31,10 +31,10 @@
                 />
               </el-col>
               <el-col :span="1">
-                <div class="vertical_devider"/>
+                <div class="vertical_devider" />
               </el-col>
               <el-col :span="14">
-                <dashboard-chart :dashboard-chart-height="dashboardChartHeight"/>
+                <dashboard-chart :dashboard-chart-height="dashboardChartHeight" />
               </el-col>
             </el-card>
           </el-row>

diff --git a/src/components/Dashboard/DashboardPortfolio.vue b/src/components/Dashboard/DashboardPortfolio.vue
@@ -13,7 +13,9 @@
         class="portfolio_card-padding"
       >
         <div class="portfolio_header">
-          <p class="portfolio_header-title">My Portfolio</p>
+          <p class="portfolio_header-title">
+            My Portfolio
+          </p>
         </div>
         <div class="portfolio_current-price">
           <el-tooltip
@@ -23,7 +25,9 @@
             <p
               class="portfolio_current-price_value"
               justify="center"
-            >{{ price.value | formatNumberLong }} {{ currencySymbol }}</p>
+            >
+              {{ price.value | formatNumberLong }} {{ currencySymbol }}
+            </p>
           </el-tooltip>
         </div>
         <div class="portfolio_diff-price">
@@ -38,23 +42,27 @@
         </div>
       </el-col>
       <el-col :span="1">
-        <div class="vertical_devider"/>
+        <div class="vertical_devider" />
       </el-col>
       <el-col :span="15">
         <div class="chart_header">
-          <div class="chart_header-name">Portfolio history</div>
+          <div class="chart_header-name">
+            Portfolio history
+          </div>
           <div class="chart_header-filter">
             <div
               v-for="(value, index) in daysLabels"
               :key="index"
               :class="[portfolioFilter !== value ? 'chart_time-filter' : 'chart_time-filter selected']"
               @click="selectLabel(value)"
             >
-              <p class="chart_time-filter_value">{{ value }}</p>
+              <p class="chart_time-filter_value">
+                {{ value }}
+              </p>
             </div>
           </div>
         </div>
-        <div class="chart_header-divider"/>
+        <div class="chart_header-divider" />
         <line-chart-portfolio
           v-loading="portfolioHistoryIsLoading"
           :data="chartData"

diff --git a/src/components/Dashboard/DashboardTable.vue b/src/components/Dashboard/DashboardTable.vue
@@ -59,9 +59,15 @@
         justify="center"
         class="table_header"
       >
-        <div class="table_header-title currency">Currency</div>
-        <div class="table_header-title text-left balance">Balance</div>
-        <div class="table_header-title text-right changes">Changes</div>
+        <div class="table_header-title currency">
+          Currency
+        </div>
+        <div class="table_header-title text-left balance">
+          Balance
+        </div>
+        <div class="table_header-title text-right changes">
+          Changes
+        </div>
       </el-row>
       <el-row class="table_body">
         <div
@@ -70,8 +76,8 @@
         >
           <div
             v-for="(value, index) in sortedPortfolio"
-            :class="['table_body-item', portfolioChart.crypto === value.asset ? 'active' : '' ]"
             :key="index"
+            :class="['table_body-item', portfolioChart.crypto === value.asset ? 'active' : '' ]"
           >
             <div
               class="table_body-item_content"

diff --git a/src/components/Home.vue b/src/components/Home.vue
@@ -4,7 +4,7 @@
 -->
 <template>
   <el-container>
-    <Menu :quorum="accountQuorum"/>
+    <Menu :quorum="accountQuorum" />
     <el-main style="width: 100%; height: 100vh; padding: 0; padding-left: 160px;">
       <router-view />
     </el-main>
@@ -41,12 +41,6 @@ export default {
     this.getCustomAssets()
   },
 
-  updated () {
-    console.log(
-      this.accountQuorum
-    )
-  },
-
   mounted () {
     document.documentElement.style.setProperty('--show-loading', 'none')
   },

diff --git a/src/components/Home/Menu.vue b/src/components/Home/Menu.vue
@@ -21,7 +21,9 @@
         <SvgIcon
           icon-name="Chart"
           icon-class="menu-icon"
-        ><ChartIcon/></SvgIcon>
+        >
+          <ChartIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -31,7 +33,9 @@
         <SvgIcon
           icon-name="Wallet"
           icon-class="menu-icon"
-        ><WalletIcon/></SvgIcon>
+        >
+          <WalletIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -47,13 +51,17 @@
           <SvgIcon
             icon-name="Exchange"
             icon-class="menu-icon"
-          ><ExchangeIcon/></SvgIcon>
+          >
+            <ExchangeIcon />
+          </SvgIcon>
         </el-badge>
         <SvgIcon
           v-else
           icon-name="Exchange"
           icon-class="menu-icon"
-        ><ExchangeIcon/></SvgIcon>
+        >
+          <ExchangeIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -63,7 +71,9 @@
         <SvgIcon
           icon-name="Report"
           icon-class="menu-icon"
-        ><ReportIcon/></SvgIcon>
+        >
+          <ReportIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -73,7 +83,9 @@
         <SvgIcon
           icon-name="Report"
           icon-class="menu-icon"
-        ><ReportIcon/></SvgIcon>
+        >
+          <ReportIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -92,13 +104,17 @@
           <SvgIcon
             icon-name="Transaction"
             icon-class="menu-icon"
-          ><TransactionsIcon/></SvgIcon>
+          >
+            <TransactionsIcon />
+          </SvgIcon>
         </el-badge>
         <SvgIcon
           v-else
           icon-name="Transaction"
           icon-class="menu-icon"
-        ><TransactionsIcon/></SvgIcon>
+        >
+          <TransactionsIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -108,7 +124,9 @@
         <SvgIcon
           icon-name="Settings"
           icon-class="menu-icon"
-        ><SettingsIcon/></SvgIcon>
+        >
+          <SettingsIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -122,7 +140,9 @@
         <SvgIcon
           icon-name="Logout"
           icon-class="menu-icon"
-        ><LogoutIcon/></SvgIcon>
+        >
+          <LogoutIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -178,7 +198,9 @@ export default {
       return this.$route.path
     },
     pendingTransactionsAmount () {
-      return this.pendingTransferTransactions.length + this.pendingSettingsTransactions.length
+      const transferTransactionsAmount = new Set(this.pendingTransferTransactions.map(({ id }) => id)).size
+      const settingsTransactionsAmount = new Set(this.pendingSettingsTransactions.map(({ id }) => id)).size
+      return transferTransactionsAmount + settingsTransactionsAmount
     }
   },
   watch: {

diff --git a/src/components/Login.vue b/src/components/Login.vue
@@ -67,7 +67,9 @@
             <div
               v-if="_isError($v.form.privateKey)"
               class="el-form-item__error"
-            >{{ _showError($v.form.privateKey) }}</div>
+            >
+              {{ _showError($v.form.privateKey) }}
+            </div>
           </el-form-item>
           <el-form-item
             label="Username"
@@ -85,7 +87,9 @@
             <div
               v-if="_isError($v.form.username)"
               class="el-form-item__error"
-            >{{ _showError($v.form.username) }}</div>
+            >
+              {{ _showError($v.form.username) }}
+            </div>
           </el-form-item>
           <el-form-item
             label="Node IP"
@@ -117,7 +121,9 @@
             <div
               v-if="_isError($v.form.nodeIp)"
               class="el-form-item__error"
-            >{{ _showError($v.form.nodeIp) }}</div>
+            >
+              {{ _showError($v.form.nodeIp) }}
+            </div>
           </el-form-item>
           <el-form-item class="auth-button-container">
             <el-row class="auth-button_actions">

diff --git a/src/components/Reports/ReportsPage.vue b/src/components/Reports/ReportsPage.vue
@@ -132,7 +132,7 @@
             style="margin-top: 40px;"
             @click="downloadSeveral({ date }, 'pdf')"
           >
-            <fa-icon icon="download"/>
+            <fa-icon icon="download" />
             PDF
           </el-button>
         </el-col>
@@ -145,7 +145,7 @@
             style="margin-top: 40px;"
             @click="downloadSeveral({ date, assets: selectedWallets }, 'csv')"
           >
-            <fa-icon icon="download"/>
+            <fa-icon icon="download" />
             CSV
           </el-button>
         </el-col>

diff --git a/src/components/Settings/components/Leftside/CurrencyItem.vue b/src/components/Settings/components/Leftside/CurrencyItem.vue
@@ -8,7 +8,9 @@
     title="Currency"
   >
     <el-row class="currencies_list">
-      <p class="list-title">Dashboard (Portfolio, Market, Balance and Changes)</p>
+      <p class="list-title">
+        Dashboard (Portfolio, Market, Balance and Changes)
+      </p>
       <el-col>
         <el-radio-group
           v-model="currentFiat"
@@ -20,12 +22,16 @@
             :label="value"
             class="currencies_list-select"
             border
-          >{{ value }}</el-radio>
+          >
+            {{ value }}
+          </el-radio>
         </el-radio-group>
       </el-col>
     </el-row>
     <el-row class="currencies_list">
-      <p class="list-title">Wallets (Market)</p>
+      <p class="list-title">
+        Wallets (Market)
+      </p>
       <el-col>
         <el-radio-group
           v-model="currentCrypto"
@@ -37,7 +43,9 @@
             :label="value"
             class="currencies_list-select"
             border
-          >{{ value }}</el-radio>
+          >
+            {{ value }}
+          </el-radio>
         </el-radio-group>
       </el-col>
     </el-row>