Skip to content

Commit

Permalink
Voters list requires page reload telosnetwork#295
Browse files Browse the repository at this point in the history
  • Loading branch information
TusharKarkera22 committed Feb 19, 2024
1 parent a63bb37 commit 650e93b
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 22 deletions.
17 changes: 14 additions & 3 deletions src/pages/trails/ballots/components/BallotListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ export default {
100;
return this.trunc(total, 2);
},
updateVotedChipVisibility() {
this.$nextTick(() => {
const votedChip = this.$refs.votedChip;
if (votedChip) {
votedChip.style.display = this.userVotes[this.ballot.ballot_name] ? 'flex' : 'none';
}
});
},
async onCastVote({ options, option, ballotName }) {
this.voting = true;
await this.castVote({
Expand Down Expand Up @@ -109,9 +117,12 @@ div
img(:src="`statics/app-icons/inactive-bgr-icon2.png`").bgr-icon2
div.column.items-start.absolute-top-left
ballot-chip(:type="ballot.category", :isBallotOpened="isBallotOpened")
ballot-chip(:type="'voted'",
:isBallotOpened="isBallotOpened",
:class="userVotes[ballot.ballot_name] ? '' : 'hidden'")
ballot-chip(
:type="'voted'"
:isBallotOpened="isBallotOpened"
:class="userVotes[ballot.ballot_name] ? '' : 'hidden'"
v-if="isBallotOpened"
)

q-separator.card-separator-vertical(vertical inset)

Expand Down
57 changes: 38 additions & 19 deletions src/pages/trails/ballots/view/BallotView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default {
scrollPosition: null,
notice: false,
showDetails: false,
showVotedChip: false,
};
},
async mounted() {
Expand Down Expand Up @@ -268,6 +269,14 @@ export default {
options: options || [option],
});
this.voting = false;
console.log('vote',ballotName)
// Check if the voting was successful, then update voted chip visibility
if (this.userVotes[ballotName]) {
this.updateVotedChipVisibility();
}
},
showAlert(message) {
this.$q.notify({
Expand All @@ -279,13 +288,13 @@ export default {
showNotification() {
this.$q.notify({
icon: this.notifications[0].icon,
message:
this.notifications[0].status === 'success'
? this.$t('notifications.trails.successSigning')
: this.$t('notifications.trails.errorSigning'),
color:
this.notifications[0].status === 'success' ? 'positive' : 'negative',
message:this.notifications[0].status === 'success'?this.$t('notifications.trails.successSigning'): this.$t('notifications.trails.errorSigning'),
color:this.notifications[0].status === 'success' ? 'positive' : 'negative',
});
if (this.notifications[0].status === 'success') {
this.userVotes[this.ballot.ballot_name] = true;
}
},
async showVoters() {
this.showDetails = this.voters.length > 0;
Expand Down Expand Up @@ -316,10 +325,12 @@ export default {
if (this.isPositiveVotePower) {
if (this.isUserRegisteredInTreasury) {
register = false;
} else {
}
else {
if (this.ballot.treasury.access === 'public') {
register = true;
} else {
}
else {
// redirect to treasuties page with filter
this.$router.push({
path: '/trails/treasuries',
Expand All @@ -328,15 +339,18 @@ export default {
return; // Do not Cast Vote
}
}
} else {
}
else {
if (this.isOfficialSymbol) {
this.showAlert('pages.trails.ballots.stakeBeforeVotingLong');
} else {
}
else {
this.showAlert(
'pages.trails.ballots.needPositiveVoteLong.' +
this.votingPowerComesFrom
'pages.trails.ballots.needPositiveVoteLong.' +
this.votingPowerComesFrom
);
}
return;
}
Expand All @@ -349,6 +363,11 @@ export default {
await this.resetUserVotes();
this.showNotification();
this.userVotes[this.ballot.ballot_name] = true;
},
updateVotedChipVisibility() {
this.showVotedChip = true;
},
async cancel() {
await this.cancelBallot(this.ballot);
Expand Down Expand Up @@ -383,10 +402,10 @@ export default {
shouldDisableCheckbox(key) {
return (
!this.isAuthenticated ||
!this.isBallotOpened(this.ballot) ||
(this.votes.length === this.ballot.max_options &&
!this.votes.includes(key))
);
!this.isBallotOpened(this.ballot) ||
(this.votes.length === this.ballot.max_options &&
!this.votes.includes(key))
);
},
displayBallotSelectionText() {
if (this.votes.length === 0) {
Expand All @@ -407,8 +426,8 @@ export default {
},
canUserVote() {
this.userCanVote =
this.votes.length >= this.ballot.min_options &&
this.votes.length <= this.ballot.max_options;
this.votes.length >= this.ballot.min_options &&
this.votes.length <= this.ballot.max_options;
return this.userCanVote;
},
shouldDisableVoteButton() {
Expand Down Expand Up @@ -485,7 +504,7 @@ export default {
ballot-chip(:type="ballot.category", :isBallotOpened="isBallotOpened(ballot)")
ballot-chip(:type="'voted'",
:isBallotOpened="isBallotOpened(ballot)",
:class="userVotes[ballot.ballot_name] ? '' : 'hidden'")
:class="{ 'hidden': !userVotes[ballot.ballot_name] }")
ballot-status(
:ballot="ballot"
:isBallotOpened="isBallotOpened(ballot)"
Expand Down

0 comments on commit 650e93b

Please sign in to comment.