krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added styles to selecting challenge winner (#9164)

Browse Source
This commit is contained in:
Keith Holliday
2017-10-05 18:02:26 -05:00
committed by GitHub
parent 58b033db9e
commit f1ec8bbf2c
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
website/client/components/challenges/closeChallengeModal.vue
View File

@@ -10,13 +10,10 @@ div
.col-12 .col-12
strong(v-once) {{$t('selectChallengeWinnersDescription')}} strong(v-once) {{$t('selectChallengeWinnersDescription')}}
.col-12 .col-12
input.form-control(type='text', v-model='searchTerm') b-dropdown.create-dropdown(:text="winnerText")
.col-12 input.form-control(type='text', v-model='searchTerm')
div(v-for='member in memberResults', @click='selectMember(member._id)') b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="selectMember(member)")
strong {{member.profile.name}} | {{ member.profile.name }}
span(v-if='winnerId === member._id') Selected
//- select.form-control(v-model='winnerId')
//- option(v-for='member in members', :value='member._id') {{member.profile.name}}
.col-12 .col-12
button.btn.btn-primary(v-once, @click='closeChallenge') {{$t('awardWinners')}} button.btn.btn-primary(v-once, @click='closeChallenge') {{$t('awardWinners')}}
.col-12 .col-12
@@ -91,7 +88,7 @@ export default {
}, },
data () { data () {
return { return {
winnerId: '', winner: {},
searchTerm: '', searchTerm: '',
memberResults: [], memberResults: [],
}; };
@@ -100,6 +97,15 @@ export default {
searchTerm: debounce(function searchTerm (newSearch) { searchTerm: debounce(function searchTerm (newSearch) {
this.searchChallengeMember(newSearch); this.searchChallengeMember(newSearch);
}, 500), }, 500),
members () {
this.memberResults = this.members;
},
},
computed: {
winnerText () {
if (!this.winner.profile) return this.$t('selectMember');
return this.winner.profile.name;
},
}, },
methods: { methods: {
async searchChallengeMember (search) { async searchChallengeMember (search) {
@@ -108,13 +114,13 @@ export default {
searchTerm: search, searchTerm: search,
}); });
}, },
selectMember (memberId) { selectMember (member) {
this.winnerId = memberId; this.winner = member;
}, },
async closeChallenge () { async closeChallenge () {
this.challenge = await this.$store.dispatch('challenges:selectChallengeWinner', { this.challenge = await this.$store.dispatch('challenges:selectChallengeWinner', {
challengeId: this.challengeId, challengeId: this.challengeId,
winnerId: this.winnerId, winnerId: this.winner._id,
}); });
this.$router.push('/challenges/myChallenges'); this.$router.push('/challenges/myChallenges');
}, },

3
website/common/locales/en/challenge.json
View File

@@ -127,5 +127,6 @@
"descriptionRequired": "Description is required", "descriptionRequired": "Description is required",
"locationRequired": "Location of challenge is required ('Add to')", "locationRequired": "Location of challenge is required ('Add to')",
"categoiresRequired": "One or more categories must be selected", "categoiresRequired": "One or more categories must be selected",
"viewProgressOf": "View Progress Of" "viewProgressOf": "View Progress Of",
"selectMember": "Select Member"
} }