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

Add checkmark to completed quests in shop (#14269)

Browse Source 
* add 'completed' property to quest items

* show checkmark on completed quests in the shop

* add 'completed' property to quest items

* show checkmark on completed quests in the shop
This commit is contained in:
Sky Chrastina
2022-10-12 14:44:22 -06:00
committed by GitHub
parent 39be8db4f9
commit f43a0d8289
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/client/src/components/shops/shopItem.vue
View File

@@ -31,6 +31,11 @@
class="svg-icon inline lock" class="svg-icon inline lock"
v-html="icons.lock" v-html="icons.lock"
></span> ></span>
<span
v-if="item.completed"
class="svg-icon inline check"
v-html="icons.check"
></span>
<span <span
v-if="item.isSuggested" v-if="item.isSuggested"
class="suggestedDot" class="suggestedDot"
@@ -200,6 +205,16 @@
color: $gray-200; color: $gray-200;
} }
span.svg-icon.inline.check {
height: 12px;
width: 10px;
position: absolute;
left: 8px;
top: 8px;
margin-top: 0;
color: $gray-200;
}
span.badge.badge-round.badge-item.badge-clock { span.badge.badge-round.badge-item.badge-clock {
height: 24px; height: 24px;
width: 24px; width: 24px;
@@ -246,6 +261,7 @@ import svgGem from '@/assets/svg/gem.svg';
import svgGold from '@/assets/svg/gold.svg'; import svgGold from '@/assets/svg/gold.svg';
import svgHourglasses from '@/assets/svg/hourglass.svg'; import svgHourglasses from '@/assets/svg/hourglass.svg';
import svgLock from '@/assets/svg/lock.svg'; import svgLock from '@/assets/svg/lock.svg';
import svgCheck from '@/assets/svg/check.svg';
import svgClock from '@/assets/svg/clock.svg'; import svgClock from '@/assets/svg/clock.svg';
import EquipmentAttributesPopover from '@/components/inventory/equipment/attributesPopover'; import EquipmentAttributesPopover from '@/components/inventory/equipment/attributesPopover';
@@ -297,6 +313,7 @@ export default {
gems: svgGem, gems: svgGem,
gold: svgGold, gold: svgGold,
lock: svgLock, lock: svgLock,
check: svgCheck,
hourglasses: svgHourglasses, hourglasses: svgHourglasses,
clock: svgClock, clock: svgClock,
}), }),
@@ -350,6 +367,7 @@ export default {
'highlight-border': this.highlightBorder, 'highlight-border': this.highlightBorder,
suggested: this.item.isSuggested, suggested: this.item.isSuggested,
locked: this.item.locked, locked: this.item.locked,
completed: this.item.completed,
}; };
}, },
countdownString () { countdownString () {

1
website/common/script/libs/getItemInfo.js
View File

@@ -152,6 +152,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
? content.quests[item.previous].text(language) ? content.quests[item.previous].text(language)
: null, : null,
unlockCondition: item.unlockCondition, unlockCondition: item.unlockCondition,
completed: user.achievements.quests[item.key] !== undefined,
drop: item.drop, drop: item.drop,
boss: item.boss, boss: item.boss,
collect: item.collect ? _mapValues(item.collect, o => ({ collect: item.collect ? _mapValues(item.collect, o => ({