From 6310482b9dd6c814c2e8bdc55156c37f5f504849 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Tue, 5 Dec 2017 10:57:28 -0500 Subject: [PATCH] Added popovers to quests (#9655) --- .../components/groups/startQuestModal.vue | 17 ++++++++++++++--- .../shops/quests/questDialogContent.vue | 1 - .../components/shops/quests/questInfo.vue | 1 - website/client/components/shops/shopItem.vue | 1 - 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/website/client/components/groups/startQuestModal.vue b/website/client/components/groups/startQuestModal.vue index 38168eae62..28982513fd 100644 --- a/website/client/components/groups/startQuestModal.vue +++ b/website/client/components/groups/startQuestModal.vue @@ -3,9 +3,18 @@ .left-panel.content h3.text-center Quests .row - .col-4.quest-col(v-for='(value, key, index) in user.items.quests', @click='selectQuest({key})', :class="{selected: key === selectedQuest}", v-if='value > 0') + .col-4.quest-col( + v-for='(value, key, index) in user.items.quests', + @click='selectQuest({key})', + :class="{selected: key === selectedQuest}", v-if='value > 0') .quest-wrapper - .quest(:class="'inventory_quest_scroll_' + key") + b-popover( + :target="`inventory_quest_scroll_${key}`" + placement="top" + triggers="hover") + h4.popover-content-title {{ quests.quests[key].text() }} + questInfo(:quest="quests.quests[key]") + .quest(:class="`inventory_quest_scroll_${key}`", :id="`inventory_quest_scroll_${key}`") .row .col-10.offset-1.text-center span.description(v-once) {{ $t('noQuestToStart') }} @@ -111,12 +120,14 @@ import goldIcon from 'assets/svg/gold.svg'; import difficultyStarIcon from 'assets/svg/difficulty-star.svg'; import questDialogDrops from '../shops/quests/questDialogDrops'; import questDialogContent from '../shops/quests/questDialogContent'; +import QuestInfo from '../shops/quests/questInfo'; export default { props: ['group'], components: { questDialogDrops, questDialogContent, + QuestInfo, }, data () { return { @@ -133,6 +144,7 @@ export default { difficultyStarIcon, }), shareUserIdShown: false, + quests, }; }, mounted () { @@ -154,7 +166,6 @@ export default { selectQuest (quest) { this.selectedQuest = quest.key; }, - async questInit () { this.loading = true; diff --git a/website/client/components/shops/quests/questDialogContent.vue b/website/client/components/shops/quests/questDialogContent.vue index 4bff1a058c..48a9eb082c 100644 --- a/website/client/components/shops/quests/questDialogContent.vue +++ b/website/client/components/shops/quests/questDialogContent.vue @@ -32,7 +32,6 @@