Skip to content

Commit 5ba0a30

Browse files
PobeptoPobepto
authored
D3 | Set account quorum equal to iroha quorum (#232)
* style: fixes linter warnings * chore: removed quorum * feat: show correct number of pending txs
1 parent 0163245 commit 5ba0a30

33 files changed

+229
-112
lines changed

‎src/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-->
55
<template>
66
<div id="app">
7-
<router-view/>
7+
<router-view />
88
</div>
99
</template>
1010

‎src/components/Dashboard/DashboardChart.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
:class="[portfolioChart.filter !== value ? 'chart_time-filter' : 'chart_time-filter selected']"
2222
@click="selectLabel(value)"
2323
>
24-
<p class="chart_time-filter_value">{{ value }}</p>
24+
<p class="chart_time-filter_value">
25+
{{ value }}
26+
</p>
2527
</div>
2628
</el-col>
2729
</el-row>

‎src/components/Dashboard/DashboardDonutChart.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<el-row>
88
<el-col :span="16">
99
<div class="crypto_header">
10-
<p class="crypto_header-title">Portfolio structure</p>
10+
<p class="crypto_header-title">
11+
Portfolio structure
12+
</p>
1113
</div>
1214
<div class="list_crypto">
1315
<div class="list_crypto-content">
@@ -32,7 +34,7 @@
3234
:span="8"
3335
class="donut-chart"
3436
>
35-
<donut-chart :data="filterPortfolio"/>
37+
<donut-chart :data="filterPortfolio" />
3638
</el-col>
3739
</el-row>
3840
</el-card>

‎src/components/Dashboard/DashboardPage.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<template>
66
<el-container
7-
v-loading.fullscreen="isDashboardLoading"
87
v-if="isDashboardLoading"
8+
v-loading.fullscreen="isDashboardLoading"
99
/>
1010
<el-container v-else-if="hasNonEmptyWallets">
1111
<el-main class="column-fullheight">
@@ -17,7 +17,7 @@
1717
/>
1818
</el-col>
1919
<el-col :span="8">
20-
<dashboard-donut-chart :portfolio="portfolioPercent"/>
20+
<dashboard-donut-chart :portfolio="portfolioPercent" />
2121
</el-col>
2222
</el-row>
2323
<el-row>
@@ -31,10 +31,10 @@
3131
/>
3232
</el-col>
3333
<el-col :span="1">
34-
<div class="vertical_devider"/>
34+
<div class="vertical_devider" />
3535
</el-col>
3636
<el-col :span="14">
37-
<dashboard-chart :dashboard-chart-height="dashboardChartHeight"/>
37+
<dashboard-chart :dashboard-chart-height="dashboardChartHeight" />
3838
</el-col>
3939
</el-card>
4040
</el-row>

‎src/components/Dashboard/DashboardPortfolio.vue‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
class="portfolio_card-padding"
1414
>
1515
<div class="portfolio_header">
16-
<p class="portfolio_header-title">My Portfolio</p>
16+
<p class="portfolio_header-title">
17+
My Portfolio
18+
</p>
1719
</div>
1820
<div class="portfolio_current-price">
1921
<el-tooltip
@@ -23,7 +25,9 @@
2325
<p
2426
class="portfolio_current-price_value"
2527
justify="center"
26-
>{{ price.value | formatNumberLong }} {{ currencySymbol }}</p>
28+
>
29+
{{ price.value | formatNumberLong }} {{ currencySymbol }}
30+
</p>
2731
</el-tooltip>
2832
</div>
2933
<div class="portfolio_diff-price">
@@ -38,23 +42,27 @@
3842
</div>
3943
</el-col>
4044
<el-col :span="1">
41-
<div class="vertical_devider"/>
45+
<div class="vertical_devider" />
4246
</el-col>
4347
<el-col :span="15">
4448
<div class="chart_header">
45-
<div class="chart_header-name">Portfolio history</div>
49+
<div class="chart_header-name">
50+
Portfolio history
51+
</div>
4652
<div class="chart_header-filter">
4753
<div
4854
v-for="(value, index) in daysLabels"
4955
:key="index"
5056
:class="[portfolioFilter !== value ? 'chart_time-filter' : 'chart_time-filter selected']"
5157
@click="selectLabel(value)"
5258
>
53-
<p class="chart_time-filter_value">{{ value }}</p>
59+
<p class="chart_time-filter_value">
60+
{{ value }}
61+
</p>
5462
</div>
5563
</div>
5664
</div>
57-
<div class="chart_header-divider"/>
65+
<div class="chart_header-divider" />
5866
<line-chart-portfolio
5967
v-loading="portfolioHistoryIsLoading"
6068
:data="chartData"

‎src/components/Dashboard/DashboardTable.vue‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,15 @@
5959
justify="center"
6060
class="table_header"
6161
>
62-
<div class="table_header-title currency">Currency</div>
63-
<div class="table_header-title text-left balance">Balance</div>
64-
<div class="table_header-title text-right changes">Changes</div>
62+
<div class="table_header-title currency">
63+
Currency
64+
</div>
65+
<div class="table_header-title text-left balance">
66+
Balance
67+
</div>
68+
<div class="table_header-title text-right changes">
69+
Changes
70+
</div>
6571
</el-row>
6672
<el-row class="table_body">
6773
<div
@@ -70,8 +76,8 @@
7076
>
7177
<div
7278
v-for="(value, index) in sortedPortfolio"
73-
:class="['table_body-item', portfolioChart.crypto === value.asset ? 'active' : '' ]"
7479
:key="index"
80+
:class="['table_body-item', portfolioChart.crypto === value.asset ? 'active' : '' ]"
7581
>
7682
<div
7783
class="table_body-item_content"

‎src/components/Home.vue‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-->
55
<template>
66
<el-container>
7-
<Menu :quorum="accountQuorum"/>
7+
<Menu :quorum="accountQuorum" />
88
<el-main style="width: 100%; height: 100vh; padding: 0; padding-left: 160px;">
99
<router-view />
1010
</el-main>
@@ -41,12 +41,6 @@ export default {
4141
this.getCustomAssets()
4242
},
4343
44-
updated () {
45-
console.log(
46-
this.accountQuorum
47-
)
48-
},
49-
5044
mounted () {
5145
document.documentElement.style.setProperty('--show-loading', 'none')
5246
},

‎src/components/Home/Menu.vue‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<SvgIcon
2222
icon-name="Chart"
2323
icon-class="menu-icon"
24-
><ChartIcon/></SvgIcon>
24+
>
25+
<ChartIcon />
26+
</SvgIcon>
2527
<span
2628
slot="title"
2729
class="title-left"
@@ -31,7 +33,9 @@
3133
<SvgIcon
3234
icon-name="Wallet"
3335
icon-class="menu-icon"
34-
><WalletIcon/></SvgIcon>
36+
>
37+
<WalletIcon />
38+
</SvgIcon>
3539
<span
3640
slot="title"
3741
class="title-left"
@@ -47,13 +51,17 @@
4751
<SvgIcon
4852
icon-name="Exchange"
4953
icon-class="menu-icon"
50-
><ExchangeIcon/></SvgIcon>
54+
>
55+
<ExchangeIcon />
56+
</SvgIcon>
5157
</el-badge>
5258
<SvgIcon
5359
v-else
5460
icon-name="Exchange"
5561
icon-class="menu-icon"
56-
><ExchangeIcon/></SvgIcon>
62+
>
63+
<ExchangeIcon />
64+
</SvgIcon>
5765
<span
5866
slot="title"
5967
class="title-left"
@@ -63,7 +71,9 @@
6371
<SvgIcon
6472
icon-name="Report"
6573
icon-class="menu-icon"
66-
><ReportIcon/></SvgIcon>
74+
>
75+
<ReportIcon />
76+
</SvgIcon>
6777
<span
6878
slot="title"
6979
class="title-left"
@@ -73,7 +83,9 @@
7383
<SvgIcon
7484
icon-name="Report"
7585
icon-class="menu-icon"
76-
><ReportIcon/></SvgIcon>
86+
>
87+
<ReportIcon />
88+
</SvgIcon>
7789
<span
7890
slot="title"
7991
class="title-left"
@@ -92,13 +104,17 @@
92104
<SvgIcon
93105
icon-name="Transaction"
94106
icon-class="menu-icon"
95-
><TransactionsIcon/></SvgIcon>
107+
>
108+
<TransactionsIcon />
109+
</SvgIcon>
96110
</el-badge>
97111
<SvgIcon
98112
v-else
99113
icon-name="Transaction"
100114
icon-class="menu-icon"
101-
><TransactionsIcon/></SvgIcon>
115+
>
116+
<TransactionsIcon />
117+
</SvgIcon>
102118
<span
103119
slot="title"
104120
class="title-left"
@@ -108,7 +124,9 @@
108124
<SvgIcon
109125
icon-name="Settings"
110126
icon-class="menu-icon"
111-
><SettingsIcon/></SvgIcon>
127+
>
128+
<SettingsIcon />
129+
</SvgIcon>
112130
<span
113131
slot="title"
114132
class="title-left"
@@ -122,7 +140,9 @@
122140
<SvgIcon
123141
icon-name="Logout"
124142
icon-class="menu-icon"
125-
><LogoutIcon/></SvgIcon>
143+
>
144+
<LogoutIcon />
145+
</SvgIcon>
126146
<span
127147
slot="title"
128148
class="title-left"
@@ -178,7 +198,9 @@ export default {
178198
return this.$route.path
179199
},
180200
pendingTransactionsAmount () {
181-
return this.pendingTransferTransactions.length + this.pendingSettingsTransactions.length
201+
const transferTransactionsAmount = new Set(this.pendingTransferTransactions.map(({ id }) => id)).size
202+
const settingsTransactionsAmount = new Set(this.pendingSettingsTransactions.map(({ id }) => id)).size
203+
return transferTransactionsAmount + settingsTransactionsAmount
182204
}
183205
},
184206
watch: {

‎src/components/Login.vue‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@
6767
<div
6868
v-if="_isError($v.form.privateKey)"
6969
class="el-form-item__error"
70-
>{{ _showError($v.form.privateKey) }}</div>
70+
>
71+
{{ _showError($v.form.privateKey) }}
72+
</div>
7173
</el-form-item>
7274
<el-form-item
7375
label="Username"
@@ -85,7 +87,9 @@
8587
<div
8688
v-if="_isError($v.form.username)"
8789
class="el-form-item__error"
88-
>{{ _showError($v.form.username) }}</div>
90+
>
91+
{{ _showError($v.form.username) }}
92+
</div>
8993
</el-form-item>
9094
<el-form-item
9195
label="Node IP"
@@ -117,7 +121,9 @@
117121
<div
118122
v-if="_isError($v.form.nodeIp)"
119123
class="el-form-item__error"
120-
>{{ _showError($v.form.nodeIp) }}</div>
124+
>
125+
{{ _showError($v.form.nodeIp) }}
126+
</div>
121127
</el-form-item>
122128
<el-form-item class="auth-button-container">
123129
<el-row class="auth-button_actions">

‎src/components/Reports/ReportsPage.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
style="margin-top: 40px;"
133133
@click="downloadSeveral({ date }, 'pdf')"
134134
>
135-
<fa-icon icon="download"/>
135+
<fa-icon icon="download" />
136136
PDF
137137
</el-button>
138138
</el-col>
@@ -145,7 +145,7 @@
145145
style="margin-top: 40px;"
146146
@click="downloadSeveral({ date, assets: selectedWallets }, 'csv')"
147147
>
148-
<fa-icon icon="download"/>
148+
<fa-icon icon="download" />
149149
CSV
150150
</el-button>
151151
</el-col>

0 commit comments

Comments
 (0)