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

Re-enable start quest button (#10532)

Browse Source 
* Check for scroll during quest pre-selection

* Re-enable start quest btn after error

* Review: remove unused start quest method
This commit is contained in:
Dexx Mandele
2018-07-30 16:02:17 +02:00
committed by Matteo Pagliazzi
parent 40495aaacb
commit 734e4a963f
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/client/components/groups/group.vue
View File

@@ -539,24 +539,6 @@ export default {
this.$store.state.upgradingGroup = this.group; this.$store.state.upgradingGroup = this.group;
this.$router.push('/group-plans'); this.$router.push('/group-plans');
}, },
clickStartQuest () {
Analytics.track({
hitType: 'event',
eventCategory: 'button',
eventAction: 'click',
eventLabel: 'Start a Quest',
});
let hasQuests = find(this.user.items.quests, (quest) => {
return quest > 0;
});
if (hasQuests) {
this.$root.$emit('bv::show::modal', 'start-quest-modal');
return;
}
// $rootScope.$state.go('options.inventory.quests');
},
showGroupGems () { showGroupGems () {
this.$root.$emit('bv::show::modal', 'group-gems-modal'); this.$root.$emit('bv::show::modal', 'group-gems-modal');
}, },

14
website/client/components/groups/startQuestModal.vue
View File

@@ -148,8 +148,13 @@ export default {
}; };
}, },
mounted () { mounted () {
let questKeys = Object.keys(this.user.items.quests); const userQuests = this.user.items.quests;
this.selectedQuest = questKeys[0]; for (const key in userQuests) {
if (userQuests[key] > 0) {
this.selectedQuest = key;
break;
}
}
this.$root.$on('selectQuest', this.selectQuest); this.$root.$on('selectQuest', this.selectQuest);
}, },
@@ -177,13 +182,14 @@ export default {
let groupId = this.group._id || this.user.party._id; let groupId = this.group._id || this.user.party._id;
const key = this.selectedQuest; const key = this.selectedQuest;
try {
const response = await this.$store.dispatch('guilds:inviteToQuest', {groupId, key}); const response = await this.$store.dispatch('guilds:inviteToQuest', {groupId, key});
const quest = response.data.data; const quest = response.data.data;
if (this.$store.state.party.data) this.$store.state.party.data.quest = quest; if (this.$store.state.party.data) this.$store.state.party.data.quest = quest;
} finally {
this.loading = false; this.loading = false;
}
this.$root.$emit('bv::hide::modal', 'start-quest-modal'); this.$root.$emit('bv::hide::modal', 'start-quest-modal');
}, },
}, },