Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rewrite activity in vue #158

Merged
merged 31 commits into from Sep 21, 2023
Merged

Rewrite activity in vue #158

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
52201d3
Rewrite activity
Duddino Jul 19, 2023
d3779cd
Add stake page
Duddino Jul 19, 2023
1940c9f
Remove undefined doms
Duddino Jul 19, 2023
970357e
Fix click not working
Duddino Jul 19, 2023
efc3612
remove huge comment
Duddino Jul 19, 2023
f7736a2
Update stake too
Duddino Jul 19, 2023
fdc2750
Pass fnewonly
Duddino Jul 25, 2023
1a75741
Remove commetn
Duddino Jul 25, 2023
b6723c5
Add txs early return
Duddino Jul 25, 2023
deacdab
Fix broken
Duddino Jul 25, 2023
8393b78
Remove console.log
Duddino Jul 26, 2023
068100c
Merge remote-tracking branch 'origin/master' into dashboard
Duddino Sep 15, 2023
0b7d56e
Merge remote-tracking branch 'origin/master' into dashboard
Duddino Sep 18, 2023
9bb345f
Rewrite activity
Duddino Sep 18, 2023
4b58343
Reuse arrTxHistory array if not needed
Duddino Sep 18, 2023
0999f95
Prettier
Duddino Sep 18, 2023
e19d11c
Add tranlsations except de
Duddino Sep 18, 2023
e394e53
Italian typo
Duddino Sep 18, 2023
6114c55
Merge branch 'master' into dashboard
Duddino Sep 19, 2023
30fdd5d
Merge remote-tracking branch 'origin/master' into dashboard
Duddino Sep 19, 2023
2eec65e
Optimize
Duddino Sep 19, 2023
71e1269
Change Sent to self -> self
Duddino Sep 19, 2023
8e78fb7
Fix not autoloading
Duddino Sep 19, 2023
7d2a5da
Remove unused variable
Duddino Sep 19, 2023
32ce913
Fix flickering
Duddino Sep 19, 2023
dcb493d
Prettier
Duddino Sep 20, 2023
81bf313
Added comments
Duddino Sep 20, 2023
00e1e70
Merge remote-tracking branch 'origin/master' into dashboard
Duddino Sep 20, 2023
10e2555
Reset activityDashboard when changing explorer
Duddino Sep 20, 2023
76a8266
Prettier
Duddino Sep 20, 2023
190b044
Configure vue
Duddino Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 3 additions & 26 deletions index.template.html
View file
Open in desktop
Expand Up @@ -490,19 +490,7 @@ <h3 class="noselect balance-title">
</center>
</div>

<div class="col-12 mb-5">
<center><span class="dcWallet-activityLbl">Activity</span></center>
<div class="dcWallet-activity">
<div class="scrollTable">
<div id="activity-list-content"></div>
<center>
<button class="pivx-button-medium" id="activityLoadMore" onclick="MPW.updateActivityGUI(false)">
<span class="buttoni-icon"><i class="fas fa-sync fa-tiny-margin" id="activityLoadMoreIcon"></i></span>
<span class="buttoni-text" data-i18n="loadMore">Load more</span>
</button>
</center>
</div>
</div>
<div id="activityDashboard" class="col-12 mb-5">
</div>
</div>

Expand Down Expand Up @@ -832,18 +820,7 @@ <h3 class="noselect balance-title">
</div>

<div class="col-12 mb-5">
<center><span class="dcWallet-activityLbl">Reward History (<span id="staking-rewards-title">-</span>)</span></center>
<div class="dcWallet-activity">
<div class="scrollTable">
<div id="staking-rewards-content"></div>
<center>
<button class="pivx-button-medium" id="stakingLoadMore" onclick="MPW.updateActivityGUI(true)">
<span class="buttoni-icon"><i class="fas fa-sync fa-tiny-margin" id="stakingLoadMoreIcon"></i></span>
<span class="buttoni-text" data-i18n="loadMore">Load more</span>
</button>
</center>
</div>
</div>
<div id="stakeActivity"> </div>
</div>
</div>

Expand Down Expand Up @@ -1199,6 +1176,6 @@ <h2 id="mnLastSeen" class="stake-balances" style="overflow-wrap: anywhere; top:
</div>

<div class="blackBack blackBackHide d-none" id="blackBack"></div>

<div id="app"></div>
</body>
</html>
209 changes: 203 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@
"node-polyfill-webpack-plugin": "^2.0.1",
"prettier": "^2.8.1",
"resource-loader": "^4.0.0-rc4",
"vue-loader": "^17.2.2",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"webpack-dev-server": "^4.11.1",
Expand Down Expand Up @@ -75,7 +76,9 @@
"lodash-es": "^4.17.21",
"pivx-promos": "^0.2.0",
"qr-scanner": "^1.4.2",
"qrcode-generator": "^1.4.4"
"qrcode-generator": "^1.4.4",
"vue": "^3.3.4",
"vue-router": "^4.2.4"
},
"alias": {
"@ledgerhq/devices": "@ledgerhq/devices/lib-es"
Expand Down