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.

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

Rewrite activity in vue #158

Merged
merged 31 commits into from Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
30 changes: 4 additions & 26 deletions index.template.html
Expand Up @@ -519,19 +519,8 @@ <h3 class="noselect balance-title">
</center>
</div>

<div class="col-12 mb-5">
<center><span data-i18n="activity" 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 @@ -861,18 +850,7 @@ <h3 class="noselect balance-title">
</div>

<div class="col-12 mb-5">
<center><span class="dcWallet-activityLbl"><span data-i18n="rewardHistory">Reward History</span> (<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 @@ -1257,6 +1235,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>
2 changes: 1 addition & 1 deletion locale/de/translation.js
Expand Up @@ -228,7 +228,7 @@ export const de_translation = {
description: 'Beschreibung', //Description
activityBlockReward: 'Block-Erlös', //Block Reward
activitySentTo: 'Gesendet an', //Sent to
activitySentToSelf: 'Umbuchung', //Sent to self
activitySentToSelf: 'Umbuchung', //Self
activityShieldedAddress: 'Geschützte Adresse', //Shielded address
activityReceivedShield: 'Erhalten von geschützter Adresse', //Received from Shielded address
activityReceivedFrom: 'Erhalten von', //Received from
Expand Down
9 changes: 4 additions & 5 deletions locale/en/translation.js
Expand Up @@ -224,12 +224,11 @@ export const en_translation = {
time: 'Time',
description: 'Description',
activityBlockReward: 'Block Reward',
activitySentTo: 'Sent to',
activitySentToSelf: 'Sent to self',
activitySentTo: 'Sent to {r}',
activitySelf: 'self',
activityShieldedAddress: 'Shielded address',
activityReceivedShield: 'Received from Shielded address',
activityReceivedFrom: 'Received from',
activityDelegatedTo: 'Delegated to',
activityReceivedFrom: 'Received from {s}',
activityDelegatedTo: 'Delegated to {r}',
activityUndelegated: 'Undelegated',
activityUnknown: 'Unknown Tx',
password: 'Password',
Expand Down
9 changes: 4 additions & 5 deletions locale/es-mx/translation.js
Expand Up @@ -232,12 +232,11 @@ export const es_mx_translation = {
time: 'Hora', //Time
description: 'Descripción', //Description
activityBlockReward: 'Recompensa del Bloque', //Block Reward
activitySentTo: 'Enviar a', //Sent to
activitySentToSelf: 'Enviar a ti mismo', //Sent to self
Duddino marked this conversation as resolved.
Show resolved Hide resolved
activitySentTo: 'Enviar a {r}', //Sent to
activitySelf: 'ti mismo', //Self
activityShieldedAddress: 'Dirección Shielded', //Shielded address
activityReceivedShield: 'Recibido desde dirección Shielded', //Received from Shielded address
activityReceivedFrom: 'Recibido de', //Received from
activityDelegatedTo: 'Delegado a', //Delegated to
activityReceivedFrom: 'Recibido de {s}', //Received from
activityDelegatedTo: 'Delegado a {r}', //Delegated to
activityUndelegated: 'No delegado', //Undelegated
activityUnknown: 'Tx desconocido', //Unknown Tx
password: 'Contraseña', //Password
Expand Down
9 changes: 4 additions & 5 deletions locale/fr/translation.js
Expand Up @@ -232,12 +232,11 @@ export const fr_translation = {
time: 'Heure', //Time
description: 'Description', //Description
activityBlockReward: 'Récompense en bloc', //Block Reward
activitySentTo: 'Envoyé à', //Sent to
activitySentToSelf: 'Envoyé à soi-même', //Sent to self
activitySentTo: 'Envoyé à {r}', //Sent to
activitySelf: 'soi-même', //Self
activityShieldedAddress: 'Adresse protégée', //Shielded address
activityReceivedShield: "Reçu d'une adresse protégée", //Received from Shielded address
activityReceivedFrom: 'Reçu de', //Received from
activityDelegatedTo: 'Délégué à', //Delegated to
activityReceivedFrom: 'Reçu de {s}', //Received from
activityDelegatedTo: 'Délégué à {r}', //Delegated to
activityUndelegated: 'Non délégué', //Undelegated
activityUnknown: 'Transaction inconnu', //Unknown Tx
password: 'Mot de passe', //Password
Expand Down
9 changes: 4 additions & 5 deletions locale/it/translation.js
Expand Up @@ -214,12 +214,11 @@ export const it_translation = {
time: 'Tempo', //Time
description: 'Descrizione', //Description
activityBlockReward: 'Ricompensa del blocco', //Block Reward
activitySentTo: 'Invia a ', //Sent to
activitySentToSelf: 'Invia a te stesso', //Sent to self
activitySentTo: 'Inviato a {r}', //Sent to
activitySelf: 'te stesso', //Self
activityShieldedAddress: 'Indirizzo protetto', //Shielded address
activityReceivedShield: 'Ricevi tramite indirizzo protetto', //Received from Shielded address
activityReceivedFrom: 'Ricevuto da ', //Received from
activityDelegatedTo: 'Delegato a ', //Delegated to
activityReceivedFrom: 'Ricevuto da {s}', //Received from
activityDelegatedTo: 'Delegato a {r}', //Delegated to
activityUndelegated: 'Non delegato', //Undelegated
activityUnknown: 'Tx sconosciuta', //Unknown Tx
password: 'Password', //Password
Expand Down
9 changes: 4 additions & 5 deletions locale/ph/translation.js
Expand Up @@ -235,12 +235,11 @@ export const ph_translation = {
time: 'Oras', //Time
description: 'Description', //Description
activityBlockReward: 'Block Reward', //Block Reward
activitySentTo: 'Naipadala sa ', //Sent to
activitySentToSelf: 'Naipadala sa sarili', //Sent to self
activitySentTo: 'Naipadala sa {r}', //Sent to
activitySelf: 'sarili', //Self
activityShieldedAddress: 'Shielded address', //Shielded address
activityReceivedShield: 'Natanggap mula sa Shielded address', //Received from Shielded address
activityReceivedFrom: 'Natanggap mula sa', //Received from
activityDelegatedTo: 'Delegated to', //Delegated to
activityReceivedFrom: 'Natanggap mula sa {s}', //Received from
activityDelegatedTo: 'Delegated to {r}', //Delegated to
activityUndelegated: 'Undeligated', //Undelegated
activityUnknown: 'Unknown Tx', //Unknown Tx
password: 'Password', //Password
Expand Down
9 changes: 4 additions & 5 deletions locale/pt-br/translation.js
Expand Up @@ -232,12 +232,11 @@ export const pt_br_translation = {
time: 'Tempo', //Time
description: 'Descrição', //Description
activityBlockReward: 'Bloco Recompensa', //Block Reward
activitySentTo: 'Enviado para', //Sent to
activitySentToSelf: 'Enviado para si mesmo', //Sent to self
activitySentTo: 'Enviado para {r}', //Sent to
activitySelf: 'si mesmo', //Self
activityShieldedAddress: 'Endereço Protegido', //Shielded address
activityReceivedShield: 'Recebido de Endereço Protegido', //Received from Shielded address
activityReceivedFrom: 'Recebido de', //Received from
activityDelegatedTo: 'Delegado a', //Delegated to
activityReceivedFrom: 'Recebido de {s}', //Received from
activityDelegatedTo: 'Delegado a {r}', //Delegated to
activityUndelegated: 'Não é Delegado', //Undelegated
activityUnknown: 'Tx desconhecido', //Unknown Tx
password: 'Senha', //Password
Expand Down
9 changes: 4 additions & 5 deletions locale/pt-pt/translation.js
Expand Up @@ -232,12 +232,11 @@ export const pt_pt_translation = {
time: 'Tempo', //Time
description: 'Descrição', //Description
activityBlockReward: 'Bloco Recompensa', //Block Reward
activitySentTo: 'Enviado para', //Sent to
activitySentToSelf: 'Enviado para si mesmo', //Sent to self
activitySentTo: 'Enviado para {r}', //Sent to
activitySelf: 'si mesmo', //Self
activityShieldedAddress: 'Endereço Protegido', //Shielded address
activityReceivedShield: 'Recebido de Endereço Protegido', //Received from Shielded address
activityReceivedFrom: 'Recebido de', //Received from
activityDelegatedTo: 'Delegado a', //Delegated to
activityReceivedFrom: 'Recebido de {s}', //Received from
activityDelegatedTo: 'Delegado a {r}', //Delegated to
activityUndelegated: 'Não é Delegado', //Undelegated
activityUnknown: 'Tx desconhecido', //Unknown Tx
password: 'Senha', //Password
Expand Down
9 changes: 4 additions & 5 deletions locale/template/translation.js
Expand Up @@ -225,12 +225,11 @@ export const translation_template = {
time: '', //Time
description: '', //Description
activityBlockReward: '', //Block Reward
activitySentTo: '', //Sent to
activitySentToSelf: '', //Sent to self
activitySentTo: '', //Sent to {}
activitySelf: '', // self
activityShieldedAddress: '', //Shielded address
activityReceivedShield: '', //Received from Shielded address
activityReceivedFrom: '', //Received from
activityDelegatedTo: '', //Delegated to
activityReceivedFrom: '', //Received from {}
activityDelegatedTo: '', // Delegated to {}
activityUndelegated: '', //Undelegated
activityUnknown: '', //Unknown Tx
password: '', //Password
Expand Down
11 changes: 5 additions & 6 deletions locale/uwu/translation.js
Expand Up @@ -228,12 +228,11 @@ export const uwu_translation = {
time: 'Time', //Time
description: 'Descwiption', //Description
activityBlockReward: 'Bwock Rewawrd', //Block Reward
activitySentTo: 'Sentu to', //Sent to
activitySentToSelf: 'Sentu to selfu', //Sent to self
activityShieldedAddress: 'Shielded addwess', //Shielded address
activityReceivedShield: 'Recewived fwom Shielded addwess', //Received from Shielded address
activityReceivedFrom: 'Recewived fwom', //Received from
activityDelegatedTo: 'Delegwated to', //Delegated to
activitySentTo: 'Sentu to {r}', //Sent to
activitySelf: 'selfu', //Self
activityReceivedShield: 'Shielded addwess', //Received from Shielded address
activityReceivedFrom: 'Recewived fwom {s}', //Received from
activityDelegatedTo: 'Delegwated to {r}', //Delegated to
activityUndelegated: 'Undelegwated', //Undelegated
activityUnknown: 'Unknown Tx', //Unknown Tx
password: 'Password', //Password
Expand Down