From 3c67f915256ed5ffa245b0d3f685eadae128569f Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Wed, 6 Dec 2017 11:13:44 -0500 Subject: [PATCH] Quest refactor (#9681) * Separated out quest sidebar component * Added accepted count --- website/client/components/groups/group.vue | 259 +--------------- .../components/groups/questSidebarSection.vue | 287 ++++++++++++++++++ 2 files changed, 293 insertions(+), 253 deletions(-) create mode 100644 website/client/components/groups/questSidebarSection.vue diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 40e7b8e1af..95164e8eef 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -28,23 +28,19 @@ .row.chat-row .col-12 h3(v-once) {{ $t('chat') }} - .row.new-message-row textarea(:placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition', @keyup.ctrl.enter='sendMessage()') autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat') - .row .col-6 button.btn.btn-secondary.float-left.fetch(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }} button.btn.btn-secondary.float-left(v-once, @click='reverseChat()') {{ $t('reverseChat') }} .col-6 button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }} - .row.community-guidelines(v-if='!communityGuidelinesAccepted') div.col-8(v-once, v-html="$t('communityGuidelinesIntro')") div.col-4 button.btn.btn-info(@click='acceptCommunityGuidelines()', v-once) {{ $t('acceptCommunityGuidelines') }} - .row .col-12.hr chat-message(:chat.sync='group.chat', :group-id='group._id', group-name='group.name') @@ -66,75 +62,8 @@ // @TODO: V2 button.btn.btn-primary(v-once, v-if='!isLeader') {{$t('messageGuildLeader')}} // Suggest making the button visible to the leader too - useful for them to test how the feature works or to send a note to themself. -- Alys .button-container // @TODO: V2 button.btn.btn-primary(v-once, v-if='isMember && !isParty') {{$t('donateGems')}} // Suggest removing the isMember restriction - it's okay if non-members donate to a public guild. Also probably allow it for parties if parties can buy imagery. -- Alys - .section-header(v-if='isParty') - .row - .col-10 - h3(v-once) {{ $t('questDetailsTitle') }} - .col-2 - .toggle-up(@click="sections.quest = !sections.quest", v-if="sections.quest") - .svg-icon(v-html="icons.upIcon") - .toggle-down(@click="sections.quest = !sections.quest", v-if="!sections.quest") - .svg-icon(v-html="icons.downIcon") - .section(v-if="sections.quest") - .row.no-quest-section(v-if='isParty && !onPendingQuest && !onActiveQuest') - .col-12.text-center - .svg-icon(v-html="icons.questIcon") - h4(v-once) {{ $t('youAreNotOnQuest') }} - p(v-once) {{ $t('questDescription') }} - button.btn.btn-secondary(v-once, @click="openStartQuestModal()") {{ $t('startAQuest') }} - .row.quest-active-section(v-if='isParty && onPendingQuest && !onActiveQuest') - .col-2 - .quest(:class='`inventory_quest_scroll_${questData.key}`') - .col-6.titles - strong {{ questData.text() }} - p {{acceptedCount}} / {{group.memberCount}} - .col-4 - button.btn.btn-secondary(@click="openQuestDetails()") {{ $t('details') }} - .row.quest-active-section.quest-invite(v-if='user.party.quest && user.party.quest.RSVPNeeded') - span {{ $t('wouldYouParticipate') }} - button.btn.btn-primary.accept(@click='questAccept(group._id)') {{$t('accept')}} - button.btn.btn-primary.reject(@click='questReject(group._id)') {{$t('reject')}} - .row.quest-active-section(v-if='isParty && !onPendingQuest && onActiveQuest') - .col-12.text-center - .quest-boss(:class="'quest_' + questData.key") - h3(v-once) {{ questData.text() }} - .quest-box - .collect-info(v-if='questData.collect') - .row(v-for='(value, key) in questData.collect') - .col-2 - div(:class="'quest_' + questData.key + '_' + key") - .col-10 - strong {{value.text()}} - .grey-progress-bar - .collect-progress-bar(:style="{width: (group.quest.progress.collect[key] / value.count) * 100 + '%'}") - strong {{group.quest.progress.collect[key]}} / {{value.count}} - .boss-info(v-if='questData.boss') - .row - .col-6 - h4.float-left(v-once) {{ questData.boss.name() }} - .col-6 - span.float-right(v-once) {{ $t('participantsTitle') }} - .row - .col-12 - .grey-progress-bar - .boss-health-bar(:style="{width: (group.quest.progress.hp / questData.boss.hp) * 100 + '%'}") - .row.boss-details - .col-6 - span.float-left - | {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}} - .col-6(v-if='userIsOnQuest') - // @TODO: Why do we not sync quset progress on the group doc? Each user could have different progress - span.float-right {{parseFloat(user.party.quest.progress.up).toFixed(1) || 0}} pending damage - .row.rage-bar-row(v-if='questData.boss.rage') - .col-12 - .grey-progress-bar - .boss-health-bar.rage-bar(:style="{width: (group.quest.progress.rage / questData.boss.rage.value) * 100 + '%'}") - .row.boss-details.rage-details(v-if='questData.boss.rage') - .col-6 - span.float-left {{ $t('rage') }} {{ parseFloat(group.quest.progress.rage).toFixed(2) }} / {{ questData.boss.rage.value }} - button.btn.btn-secondary(v-once, @click="questAbort()", v-if='canEditQuest') {{ $t('abort') }} - + quest-sidebar-section(@toggle='toggleQuestSection', :show='sections.quest', :group='group') .section-header(v-if='!isParty') .row .col-10 @@ -146,7 +75,6 @@ .svg-icon(v-html="icons.downIcon") .section(v-if="sections.summary") p(v-markdown='group.summary') - .section-header .row .col-10 @@ -158,7 +86,6 @@ .svg-icon(v-html="icons.downIcon") .section(v-if="sections.description") p(v-markdown='group.description') - .section-header.challenge .row .col-10.information-header @@ -335,26 +262,6 @@ margin-right: .3em; } - .no-quest-section { - padding: 2em; - color: $gray-300; - - h4 { - color: $gray-300; - } - - p { - margin-bottom: 2em; - } - - .svg-icon { - height: 30px; - width: 30px; - margin: 0 auto; - margin-bottom: 2em; - } - } - .information-header { h3, .tooltip-wrapper { display: inline-block; @@ -366,62 +273,6 @@ } } - .quest-active-section { - .titles { - padding-top: .5em; - } - - .quest-box { - background-image: url('~client/assets/svg/for-css/quest-border.svg'); - background-size: 100% 100%; - width: 100%; - padding: .5em; - margin-bottom: 1em; - - svg: { - width: 100%; - height: 100%; - } - } - - .boss-info, .collect-info { - width: 90%; - margin: 0 auto; - text-align: left; - } - } - - .quest-invite { - background-color: #2995cd; - color: #fff; - padding: 1em; - - span { - margin-top: .3em; - font-size: 14px; - font-weight: bold; - } - - .accept, .reject { - padding: .2em 1em; - font-size: 12px; - height: 24px; - border-radius: 2px; - box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12); - } - - .accept { - background-color: #24cc8f; - margin-left: 4em; - margin-right: .5em; - } - - .reject { - border-radius: 2px; - background-color: #f74e52; - } - } - .section-header { border-top: 1px solid #e1e0e3; margin-top: 1em; @@ -438,38 +289,6 @@ cursor: pointer; } - .quest-boss { - margin: 0 auto; - } - - .boss-health-bar { - width: 80%; - background-color: red; - height: 15px; - margin-bottom: .5em; - } - - .rage-details { - margin-bottom: 1em; - } - - .boss-health-bar.rage-bar { - margin-top: 1em; - background-color: orange; - } - - .grey-progress-bar { - width: 100%; - height: 15px; - background-color: #e1e0e3; - } - - .collect-progress-bar { - background-color: #24cc8f; - height: 15px; - max-width: 100%; - } - .hr { width: 100%; height: 20px; @@ -491,14 +310,13 @@ import * as Analytics from 'client/libs/analytics'; import membersModal from './membersModal'; import startQuestModal from './startQuestModal'; import questDetailsModal from './questDetailsModal'; -import quests from 'common/script/content/quests'; -import percent from 'common/script/libs/percent'; import groupFormModal from './groupFormModal'; import inviteModal from './inviteModal'; import chatMessage from '../chat/chatMessages'; import autocomplete from '../chat/autoComplete'; import groupChallenges from '../challenges/groupChallenges'; import groupGemsModal from 'client/components/groups/groupGemsModal'; +import questSidebarSection from 'client/components/groups/questSidebarSection'; import markdownDirective from 'client/directives/markdown'; import deleteIcon from 'assets/svg/delete.svg'; @@ -529,6 +347,7 @@ export default { autocomplete, questDetailsModal, groupGemsModal, + questSidebarSection, }, directives: { markdown: markdownDirective, @@ -573,17 +392,6 @@ export default { if (!this.group.quest || !this.group.quest.members) return false; return Boolean(this.group.quest.members[this.user._id]); }, - acceptedCount () { - let count = 0; - - if (!this.group || !this.group.quest) return count; - - for (let uuid in this.group.quest.members) { - if (this.group.quest.members[uuid]) count += 1; - } - - return count; - }, communityGuidelinesAccepted () { return this.user.flags.communityGuidelinesAccepted; }, @@ -593,12 +401,6 @@ export default { isParty () { return this.$route.path.startsWith('/party'); }, - onPendingQuest () { - return Boolean(this.group.quest.key) && !this.group.quest.active; - }, - onActiveQuest () { - return this.group.quest.active; - }, isLeader () { return this.user._id === this.group.leader._id; }, @@ -608,26 +410,6 @@ export default { isMember () { return this.isMemberOfGroup(this.user, this.group); }, - canEditQuest () { - if (!this.group.quest) return false; - let isQuestLeader = this.group.quest.leader === this.user._id; - let isPartyLeader = this.group.leader._id === this.user._id; - return isQuestLeader || isPartyLeader; - }, - isMemberOfPendingQuest () { - let userid = this.user._id; - let group = this.group; - if (!group.quest || !group.quest.members) return false; - if (group.quest.active) return false; // quest is started, not pending - return userid in group.quest.members && group.quest.members[userid] !== false; - }, - isMemberOfRunningQuest () { - let userid = this.user._id; - let group = this.group; - if (!group.quest || !group.quest.members) return false; - if (!group.quest.active) return false; // quest is pending, not started - return group.quest.members[userid]; - }, memberProfileName (memberId) { let foundMember = find(this.group.members, function findMember (member) { return member._id === memberId; @@ -647,13 +429,6 @@ export default { if (!this.group.challenges) return false; return this.group.challenges.length === 0; }, - bossHpPercent () { - return percent(this.group.quest.progress.hp, this.questData.boss.hp); - }, - questData () { - if (!this.group.quest) return {}; - return quests.quests[this.group.quest.key]; - }, }, mounted () { if (!this.searchId) this.searchId = this.groupId; @@ -782,12 +557,6 @@ export default { // User.clearPMs(); } }, - openStartQuestModal () { - this.$root.$emit('bv::show::modal', 'start-quest-modal'); - }, - openQuestDetails () { - this.$root.$emit('bv::show::modal', 'quest-details'); - }, checkForAchievements () { // Checks if user's party has reached 2 players for the first time. if (!this.user.achievements.partyUp && this.group.memberCount >= 2) { @@ -883,28 +652,12 @@ export default { startingPage: 'profile', }); }, - async questAbort () { - if (!confirm(this.$t('sureAbort'))) return; - if (!confirm(this.$t('doubleSureAbort'))) return; - let quest = await this.$store.dispatch('quests:sendAction', {groupId: this.group._id, action: 'quests/abort'}); - this.group.quest = quest; - }, - async questLeave () { - if (!confirm(this.$t('sureLeave'))) return; - let quest = await this.$store.dispatch('quests:sendAction', {groupId: this.group._id, action: 'quests/leave'}); - this.group.quest = quest; - }, - async questAccept (partyId) { - let quest = await this.$store.dispatch('quests:sendAction', {groupId: partyId, action: 'quests/accept'}); - this.user.party.quest = quest; - }, - async questReject (partyId) { - let quest = await this.$store.dispatch('quests:sendAction', {groupId: partyId, action: 'quests/reject'}); - this.user.party.quest = quest; - }, showGroupGems () { this.$root.$emit('bv::show::modal', 'group-gems-modal'); }, + toggleQuestSection () { + this.sections.quest = !this.sections.quest; + }, }, }; diff --git a/website/client/components/groups/questSidebarSection.vue b/website/client/components/groups/questSidebarSection.vue new file mode 100644 index 0000000000..0594f73ae4 --- /dev/null +++ b/website/client/components/groups/questSidebarSection.vue @@ -0,0 +1,287 @@ + + + + +