martyn
/
townsquare
mirror of https://github.com/bra1n/townsquare.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83 from JulGvoz/main 

voting, majority & passed clarified (closes #82)
This commit is contained in:
Steffen 2021-01-09 20:13:31 +01:00 committed by GitHub
parent 012954f7f4 c7b251a4a0
commit 8c87f696d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/modals/VoteHistoryModal.vue
View File

@ -15,22 +15,42 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<td>Time</td>
<td>Nominator</td> <td>Nominator</td>
<td>Nominee</td> <td>Nominee</td>
<td>Type</td> <td>Type</td>
<td>Votes</td>
<td>Majority</td> <td>Majority</td>
<td><font-awesome-icon icon="hand-paper" /> Hand up</td> <td>
<font-awesome-icon icon="user-friends" />
Voters
</td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(vote, index) in session.voteHistory" :key="index"> <tr v-for="(vote, index) in session.voteHistory" :key="index">
<td>
{{ vote.timestamp.getHours().toString().padStart(2, "0") }}:{{
vote.timestamp.getMinutes().toString().padStart(2, "0")
}}
</td>
<td>{{ vote.nominator }}</td> <td>{{ vote.nominator }}</td>
<td>{{ vote.nominee }}</td> <td>{{ vote.nominee }}</td>
<td>{{ vote.type }}</td> <td>{{ vote.type }}</td>
<td>{{ vote.majority }}</td>
<td> <td>
{{ vote.votes.length }} {{ vote.votes.length }}
<font-awesome-icon icon="user-friends" /> <font-awesome-icon icon="hand-paper" />
</td>
<td>
{{ vote.majority }}
<font-awesome-icon
:icon="[
'fas',
vote.votes.length >= vote.majority ? 'check-square' : 'square'
]"
/>
</td>
<td>
{{ vote.votes.join(", ") }} {{ vote.votes.join(", ") }}
</td> </td>
</tr> </tr>
@ -89,13 +109,16 @@ thead td {
} }
tbody { tbody {
td:nth-child(1) { td:nth-child(2) {
color: $townsfolk; color: $townsfolk;
} }
td:nth-child(2) { td:nth-child(3) {
color: $demon; color: $demon;
} }
td:nth-child(4) { td:nth-child(5) {
text-align: center;
}
td:nth-child(6) {
text-align: center; text-align: center;
} }
} }

2
src/store/modules/session.js
View File

@ -72,8 +72,8 @@ const mutations = {
addHistory(state, players) { addHistory(state, players) {
if (!state.nomination || state.lockedVote <= players.length) return; if (!state.nomination || state.lockedVote <= players.length) return;
const isBanishment = players[state.nomination[1]].role.team === "traveler"; const isBanishment = players[state.nomination[1]].role.team === "traveler";
console.log(isBanishment);
state.voteHistory.push({ state.voteHistory.push({
timestamp: new Date(),
nominator: players[state.nomination[0]].name, nominator: players[state.nomination[0]].name,
nominee: players[state.nomination[1]].name, nominee: players[state.nomination[1]].name,
type: isBanishment ? "Banishment" : "Execution", type: isBanishment ? "Banishment" : "Execution",