sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-12 23:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP(shops): dates and fixes

Browse source
This commit is contained in:
Sabe Jones 2024-04-22 17:52:07 -05:00
parent 28b936e2d1
commit 5cd58d4119
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
website/client/src/components/header/userDropdown.vue
View file

@ -35,13 +35,9 @@
/>
</a>
<a
class="topbar-dropdown-item dropdown-item"
class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('body', 'size')"
>{{ $t('editAvatar') }}</a>
<a
class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('backgrounds', '2024')"
>{{ $t('backgrounds') }}</a>
<a
class="topbar-dropdown-item dropdown-item"
@click="showProfile('profile')"

2
website/client/src/components/ui/selectList.vue
View file

@ -132,7 +132,7 @@ export default {
},
methods: {
getKeyProp (item) {
return this.keyProp ? item[this.keyProp] : item;
return this.keyProp ? item[this.keyProp] : item.key;
},
isDisabled (item) {
return typeof item[this.disabledProp] === 'undefined' ? false : item[this.disabledProp];

7
website/common/script/content/constants/schedule.js
View file

@ -857,9 +857,10 @@ export function getScheduleMatchingGroup (type, date) {
});
}
if (!cachedScheduleMatchers[type]) {
let end = moment(checkedDate).date(TYPE_SCHEDULE[type]);
if (end.date() <= checkedDate.date()) {
end = moment(end).add(1, 'months');
let end = moment(checkedDate);
end.date(TYPE_SCHEDULE[type]);
if (end.date() <= moment(checkedDate).date()) {
moment(end).add(1, 'months');
}
return {
end: end.toDate(),

2
website/common/script/libs/getItemInfo.js
View file

@ -491,7 +491,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
}
if (matcher) {
itemInfo.end = { matcher };
itemInfo.end = matcher.end;
}
return itemInfo;

1
website/common/script/libs/shops.js
View file

@ -582,6 +582,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
bg,
officialPinnedItems,
language,
matchers,
);
backgroundCategory.items.push(item);
}