sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-04-14 19:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2021-06-09 08:26:20 -05:00
commit 32ba02df28
8 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.196.0",
"version": "4.196.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.196.0",
"version": "4.196.1",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.14.3",

2
website/client/src/components/shops/countdownBanner.vue
View file

@ -78,7 +78,7 @@ export default {
this.cancelAutoUpdate();
} else if (diffDuration.days() > 0) {
this.limitedString = this.$t('limitedAvailabilityDays', {
days: diffDuration.days(),
days: moment(this.endDate).diff(moment(), 'days'),
hours: diffDuration.hours(),
minutes: diffDuration.minutes(),
});

7
website/client/src/components/shops/quests/questInfo.vue
View file

@ -143,8 +143,6 @@ import svgStar from '@/assets/svg/difficulty-star.svg';
import svgStarHalf from '@/assets/svg/difficulty-star-half.svg';
import svgStarEmpty from '@/assets/svg/difficulty-star-empty.svg';
import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
export default {
props: {
quest: {
@ -205,13 +203,14 @@ export default {
return collect.text;
},
countdownString () {
const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
if (!this.quest.event) return;
const diffDuration = moment.duration(moment(this.quest.event.end).diff(moment()));
if (diffDuration.asSeconds() <= 0) {
this.limitedString = this.$t('noLongerAvailable');
} else if (diffDuration.days() > 0) {
this.limitedString = this.$t('limitedAvailabilityDays', {
days: diffDuration.days(),
days: moment(this.quest.event.end).diff(moment(), 'days'),
hours: diffDuration.hours(),
minutes: diffDuration.minutes(),
});

5
website/client/src/components/shops/quests/questRewards.vue
View file

@ -1,5 +1,8 @@
<template>
<div class="quest-rewards">
<div
class="quest-rewards"
v-if="quest.drop"
>
<div
class="header d-flex align-items-center"
@click="toggle"

7
website/client/src/components/shops/shopItem.vue
View file

@ -250,8 +250,6 @@ import EquipmentAttributesPopover from '@/components/inventory/equipment/attribu
import QuestInfo from './quests/questInfo.vue';
import seasonalShopConfig from '@/../../common/script/libs/shops-seasonal.config';
export default {
components: {
EquipmentAttributesPopover,
@ -341,13 +339,14 @@ export default {
};
},
countdownString () {
const diffDuration = moment.duration(moment(seasonalShopConfig.dateRange.end).diff(moment()));
if (!this.item.event) return;
const diffDuration = moment.duration(moment(this.item.event.end).diff(moment()));
if (diffDuration.asSeconds() <= 0) {
this.limitedString = this.$t('noLongerAvailable');
} else if (diffDuration.days() > 0) {
this.limitedString = this.$t('limitedAvailabilityDays', {
days: diffDuration.days(),
days: moment(this.item.event.end).diff(moment(), 'days'),
hours: diffDuration.hours(),
minutes: diffDuration.minutes(),
});

3
website/common/script/content/bundles.js
View file

@ -38,8 +38,9 @@ const bundles = {
'turtle',
'whale',
],
event: EVENTS.bundle202106,
canBuy () {
return moment().isBetween('2019-07-17', '2019-08-02');
return moment().isBefore(EVENTS.bundle202106.end);
},
type: 'quests',
class: 'quest_bundle_splashyPals',

8
website/common/script/content/constants/events.js
View file

@ -10,11 +10,17 @@ const gemsPromo = {
export const EVENTS = {
noCurrentEvent2021: {
start: '2021-05-31T20:00-05:00',
start: '2021-07-31T20:00-05:00',
end: '2021-08-23T08:00-05:00',
season: 'normal',
npcImageSuffix: '',
},
bundle202106: {
start: '2021-06-08T08:00-05:00',
end: '2021-07-31T20:00-05:00',
season: 'normal',
npcImageSuffix: '',
},
potions202105: {
start: '2021-05-11T08:00-05:00',
end: '2021-05-31T20:00-05:00',