From 456c5e57bc7ddc08287758bc0caaeb66d2dd003f Mon Sep 17 00:00:00 2001 From: negue Date: Thu, 18 Oct 2018 19:58:14 +0200 Subject: [PATCH 01/14] refactor petItem - pet image states --- .../components/inventory/stable/index.vue | 27 ------- .../components/inventory/stable/petItem.vue | 80 +++++++++++++++++-- 2 files changed, 75 insertions(+), 32 deletions(-) diff --git a/website/client/components/inventory/stable/index.vue b/website/client/components/inventory/stable/index.vue index 8619555884..8634d67166 100644 --- a/website/client/components/inventory/stable/index.vue +++ b/website/client/components/inventory/stable/index.vue @@ -86,7 +86,6 @@ ) petItem( :item="item", - :itemContentClass="getPetItemClass(item)", :popoverPosition="'top'", :progress="item.progress", :emptyItem="!item.isOwned()", @@ -94,17 +93,6 @@ :highlightBorder="highlightPet == item.key", @click="petClicked(item)" ) - span(slot="popoverContent") - div.hatchablePopover(v-if="item.isHatchable()") - h4.popover-content-title {{ item.name }} - div.popover-content-text(v-html="$t('haveHatchablePet', { potion: item.potionName, egg: item.eggName })") - div.potionEggGroup - div.potionEggBackground - div(:class="'Pet_HatchingPotion_'+item.potionKey") - div.potionEggBackground - div(:class="'Pet_Egg_'+item.eggKey") - div(v-else) - h4.popover-content-title {{ item.name }} template(slot="itemBadge", slot-scope="context") starBadge(:selected="item.key === currentPet", :show="item.isOwned()", @click="selectPet(item)") @@ -710,21 +698,6 @@ return groupBy(mounts, groupKey); }, - getPetItemClass (pet) { - if (pet.isOwned()) { - return `Pet Pet-${pet.key} ${pet.eggKey}`; - } - - if (pet.isHatchable()) { - return 'PixelPaw'; - } - - if (pet.mountOwned()) { - return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`; - } - - return 'GreyedOut PixelPaw'; - }, hasDrawerTabItems (index) { return this.drawerTabs && this.drawerTabs[index].items.length !== 0; }, diff --git a/website/client/components/inventory/stable/petItem.vue b/website/client/components/inventory/stable/petItem.vue index f1771dd031..967d6a67e1 100644 --- a/website/client/components/inventory/stable/petItem.vue +++ b/website/client/components/inventory/stable/petItem.vue @@ -5,7 +5,10 @@ div :class="{'item-empty': emptyItem, 'highlight': highlightBorder}", ) slot(name="itemBadge", :item="item") - span.item-content(:class="itemContentClass") + span.item-content.hatchAgain(v-if="mountOwned && isHatchable") + span.egg(:class="eggClass") + span.potion(:class="potionClass") + span.item-content(v-else, :class="getPetItemClass(item)") span.pet-progress-background(v-if="item.isAllowedToFeed() && progress > 0") div.pet-progress-bar(v-bind:style="{width: 100 * progress/50 + '%' }") span.item-label(v-if="label") {{ label }} @@ -15,7 +18,17 @@ div :triggers="showPopover ? 'hover' : ''", :placement="popoverPosition", ) - slot(name="popoverContent", :item="item") + div.hatchablePopover(v-if="item.isHatchable()") + h4.popover-content-title {{ item.name }} + div.popover-content-text(v-html="$t('haveHatchablePet', { potion: item.potionName, egg: item.eggName })") + div.potionEggGroup + div.potionEggBackground + div(:class="potionClass") + div.potionEggBackground + div(:class="eggClass") + div(v-else) + h4.popover-content-title {{ item.name }} + From 16256ee190184c4efd320a87c2da7d6a5f3950e7 Mon Sep 17 00:00:00 2001 From: negue Date: Mon, 22 Oct 2018 21:22:26 +0200 Subject: [PATCH 02/14] fix issues --- .../components/inventory/stable/petItem.vue | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/website/client/components/inventory/stable/petItem.vue b/website/client/components/inventory/stable/petItem.vue index 967d6a67e1..e61b220d0c 100644 --- a/website/client/components/inventory/stable/petItem.vue +++ b/website/client/components/inventory/stable/petItem.vue @@ -8,7 +8,7 @@ div span.item-content.hatchAgain(v-if="mountOwned && isHatchable") span.egg(:class="eggClass") span.potion(:class="potionClass") - span.item-content(v-else, :class="getPetItemClass(item)") + span.item-content(v-else, :class="getPetItemClass()") span.pet-progress-background(v-if="item.isAllowedToFeed() && progress > 0") div.pet-progress-bar(v-bind:style="{width: 100 * progress/50 + '%' }") span.item-label(v-if="label") {{ label }} @@ -111,13 +111,13 @@ div click () { this.$emit('click', {}); }, - getPetItemClass (pet) { + getPetItemClass () { if (this.mountOwned && !this.isHatchable) { - return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`; + return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`; } - if (this.isOwned) { - return `Pet Pet-${pet.key} ${pet.eggKey}`; + if (this.item.isOwned()) { + return `Pet Pet-${this.item.key} ${this.item.eggKey}`; } if (this.isHatchable) { @@ -125,7 +125,7 @@ div } if (this.mountOwned) { - return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`; + return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`; } // Can't hatch @@ -139,9 +139,6 @@ div eggClass () { return `Pet_Egg_${this.item.eggKey}`; }, - isOwned () { - return this.item.isOwned(); - }, isHatchable () { return this.item.isHatchable(); }, From 3c5025a78e13c16f85eba6429f2f6e85a5277a00 Mon Sep 17 00:00:00 2001 From: negue Date: Wed, 24 Oct 2018 20:43:15 +0200 Subject: [PATCH 03/14] fix background empty / resetCallback - refactor pet methods/components --- .../inventory/stable/hatchingModal.vue | 9 +----- .../components/inventory/stable/index.vue | 1 - .../components/inventory/stable/petItem.vue | 31 ++++++++----------- website/client/mixins/petMixin.js | 3 ++ 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/website/client/components/inventory/stable/hatchingModal.vue b/website/client/components/inventory/stable/hatchingModal.vue index cfd89d47bc..a7fc612f89 100644 --- a/website/client/components/inventory/stable/hatchingModal.vue +++ b/website/client/components/inventory/stable/hatchingModal.vue @@ -1,5 +1,5 @@