Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into negue/ui/setting

Browse Source 
# Conflicts:
#	website/client/src/router/user-routes.js
This commit is contained in:
negue
2023-08-21 21:51:22 +02:00
parent 8c568060f9 82ebe71eb4
commit 41cde37675
64 changed files with 614 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/common/script/content/bundles.js
+1 -1
View File
@@ -102,7 +102,7 @@ const bundles = {
'butterfly',
],
canBuy () {
return moment().isBetween('2020-03-09', '2020-04-02');
return moment().isBetween(EVENTS.bundle202308.start, EVENTS.bundle202308.end);
},
type: 'quests',
value: 7,
website/common/script/content/constants/events.js
+9 -1
View File
@@ -11,10 +11,18 @@ const gemsPromo = {
export const EVENTS = {
noEvent: {
start: '2023-08-01T23:59-04:00',
end: '2023-08-31T08:00-04:00',
end: '2023-08-10T08:00-04:00',
season: 'normal',
npcImageSuffix: '',
},
bundle202308: {
start: '2023-08-15T08:00-04:00',
end: '2023-08-31T23:59-04:00',
},
potions202308: {
start: '2023-08-15T08:00-04:00',
end: '2023-08-31T23:59-04:00',
},
summer2023: {
start: '2023-06-20T08:00-04:00',
end: '2023-07-31T23:59-04:00',
website/common/script/content/hatching-potions.js
+8 -8
View File
@@ -140,13 +140,13 @@ const premium = {
value: 2,
text: t('hatchingPotionThunderstorm'),
limited: true,
event: EVENTS.bundle202211,
event: EVENTS.potions202308,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndNovember'),
previousDate: t('novemberYYYY', { year: 2021 }),
availableDate: t('dateEndAugust'),
previousDate: t('novemberYYYY', { year: 2022 }),
}),
canBuy () {
return moment().isBetween(EVENTS.bundle202211.start, EVENTS.bundle202211.end);
return moment().isBetween(EVENTS.potions202308.start, EVENTS.potions202308.end);
},
},
Spooky: {
@@ -542,13 +542,13 @@ const premium = {
value: 2,
text: t('hatchingPotionPorcelain'),
limited: true,
event: EVENTS.birthday10,
event: EVENTS.potions202308,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateStartFebruary'),
previousDate: t('augustYYYY', { year: 2022 }),
availableDate: t('dateStartAugust'),
previousDate: t('februaryYYYY', { year: 2022 }),
}),
canBuy () {
return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end);
return moment().isBetween(EVENTS.potions202308.start, EVENTS.potions202308.end);
},
},
PinkMarble: {
website/common/script/content/shop-featuredItems.js
+13 -13
View File
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBetween(EVENTS.summer2023.start, EVENTS.summer2023.end)) {
if (moment().isBetween(EVENTS.potions202308.start, EVENTS.potions202308.end)) {
return [
{
type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Sunset',
path: 'premiumHatchingPotions.Thunderstorm',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Glass',
path: 'premiumHatchingPotions.Porcelain',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.SandSculpture',
type: 'hatchingPotions',
path: 'hatchingPotions.Zombie',
},
];
}
@@ -32,32 +32,32 @@ const featuredItems = {
},
{
type: 'food',
path: 'food.Honey',
path: 'food.Meat',
},
{
type: 'hatchingPotions',
path: 'hatchingPotions.Golden',
path: 'hatchingPotions.Zombie',
},
{
type: 'eggs',
path: 'eggs.Dragon',
path: 'eggs.Fox',
},
];
},
quests () {
if (moment().isBetween(EVENTS.bundle202306.start, EVENTS.bundle202306.end)) {
if (moment().isBetween(EVENTS.bundle202308.start, EVENTS.bundle202308.end)) {
return [
{
type: 'bundles',
path: 'bundles.splashyPals',
path: 'bundles.hugabug',
},
{
type: 'quests',
path: 'quests.harpy',
path: 'quests.octopus',
},
{
type: 'quests',
path: 'quests.owl',
path: 'quests.rock',
},
];
}
@@ -89,7 +89,7 @@ const featuredItems = {
},
{
type: 'quests',
path: 'quests.nudibranch',
path: 'quests.axolotl',
},
];
},