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

Merge branch 'release' into develop

Browse source
This commit is contained in:
SabreCat 2023-05-11 14:13:58 -05:00
commit 6e3a367832
17 changed files with 149 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
habitica-images

@ -1 +1 @@
Subproject commit 311cb010591a9de368a1ab5db7506d2d3efbb10b
Subproject commit dac6a71d1fa2500bf8f3ec18bf917cbe91d82d64

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.269.0",
"version": "4.270.0",
"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.269.0",
"version": "4.270.0",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.21.4",

1
test/api/v3/integration/groups/POST-groups_groupId_join.test.js
View file

@ -2,7 +2,6 @@ import { v4 as generateUUID } from 'uuid';
import {
generateUser,
createAndPopulateGroup,
checkExistence,
translate as t,
} from '../../../../helpers/api-integration/v3';

3
test/api/v3/integration/groups/POST-groups_invite.test.js
View file

@ -626,7 +626,8 @@ describe('Post /groups/:groupId/invite', () => {
});
describe('party size limits', () => {
let party, partyLeader;
let party;
let partyLeader;
beforeEach(async () => {
group = await createAndPopulateGroup({

75
website/client/src/assets/css/sprites/spritesmith-main.css
View file

@ -820,6 +820,11 @@
width: 141px;
height: 147px;
}
.background_cretaceous_forest {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cretaceous_forest.png');
width: 141px;
height: 147px;
}
.background_crosscountry_ski_trail {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_crosscountry_ski_trail.png');
width: 141px;
@ -1054,6 +1059,11 @@
width: 141px;
height: 147px;
}
.background_flying_over_hedge_maze {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_over_hedge_maze.png');
width: 141px;
height: 147px;
}
.background_flying_over_icy_steppes {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_over_icy_steppes.png');
width: 141px;
@ -1329,6 +1339,11 @@
width: 141px;
height: 147px;
}
.background_in_a_painting {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_a_painting.png');
width: 141px;
height: 147px;
}
.background_in_an_ancient_tomb {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_an_ancient_tomb.png');
width: 141px;
@ -2506,6 +2521,11 @@
width: 68px;
height: 68px;
}
.icon_background_cretaceous_forest {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_cretaceous_forest.png');
width: 68px;
height: 68px;
}
.icon_background_crosscountry_ski_trail {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_crosscountry_ski_trail.png');
width: 68px;
@ -2740,6 +2760,11 @@
width: 68px;
height: 68px;
}
.icon_background_flying_over_hedge_maze {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_over_hedge_maze.png');
width: 68px;
height: 68px;
}
.icon_background_flying_over_icy_steppes {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_over_icy_steppes.png');
width: 68px;
@ -3015,6 +3040,11 @@
width: 68px;
height: 68px;
}
.icon_background_in_a_painting {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_a_painting.png');
width: 68px;
height: 68px;
}
.icon_background_in_an_ancient_tomb {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_an_ancient_tomb.png');
width: 68px;
@ -18640,6 +18670,11 @@
width: 90px;
height: 90px;
}
.broad_armor_armoire_paintersApron {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_paintersApron.png');
width: 114px;
height: 90px;
}
.broad_armor_armoire_pirateOutfit {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_pirateOutfit.png');
width: 114px;
@ -19130,6 +19165,11 @@
width: 90px;
height: 90px;
}
.head_armoire_paintersBeret {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_paintersBeret.png');
width: 114px;
height: 90px;
}
.head_armoire_paperBag {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_paperBag.png');
width: 90px;
@ -19470,6 +19510,11 @@
width: 90px;
height: 90px;
}
.shield_armoire_paintersPalette {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_paintersPalette.png');
width: 114px;
height: 90px;
}
.shield_armoire_perchingFalcon {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_perchingFalcon.png');
width: 90px;
@ -19910,6 +19955,11 @@
width: 68px;
height: 68px;
}
.shop_armor_armoire_paintersApron {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_paintersApron.png');
width: 68px;
height: 68px;
}
.shop_armor_armoire_pirateOutfit {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_pirateOutfit.png');
width: 68px;
@ -20415,6 +20465,11 @@
width: 68px;
height: 68px;
}
.shop_head_armoire_paintersBeret {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_paintersBeret.png');
width: 68px;
height: 68px;
}
.shop_head_armoire_paperBag {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_paperBag.png');
width: 68px;
@ -20755,6 +20810,11 @@
width: 68px;
height: 68px;
}
.shop_shield_armoire_paintersPalette {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_paintersPalette.png');
width: 68px;
height: 68px;
}
.shop_shield_armoire_perchingFalcon {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_perchingFalcon.png');
width: 68px;
@ -21200,6 +21260,11 @@
width: 68px;
height: 68px;
}
.shop_weapon_armoire_paintbrush {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_paintbrush.png');
width: 68px;
height: 68px;
}
.shop_weapon_armoire_paperCutter {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_paperCutter.png');
width: 68px;
@ -21655,6 +21720,11 @@
width: 90px;
height: 90px;
}
.slim_armor_armoire_paintersApron {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_paintersApron.png');
width: 114px;
height: 90px;
}
.slim_armor_armoire_pirateOutfit {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_pirateOutfit.png');
width: 114px;
@ -22110,6 +22180,11 @@
width: 114px;
height: 90px;
}
.weapon_armoire_paintbrush {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_paintbrush.png');
width: 114px;
height: 90px;
}
.weapon_armoire_paperCutter {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_paperCutter.png');
width: 114px;

6
website/client/src/components/groups/createPartyModal.vue
View file

@ -264,12 +264,6 @@ export default {
},
mounted () {
this.seeking = Boolean(this.user.party.seeking);
Analytics.track({
eventName: 'Start a Party button',
eventAction: 'Start a Party button',
eventCategory: 'behavior',
hitType: 'event',
}, { trackOnClient: true });
},
methods: {
async createParty () {

8
website/client/src/components/groups/lookingForParty.vue
View file

@ -243,8 +243,6 @@ import rogueIcon from '@/assets/svg/rogue.svg';
import healerIcon from '@/assets/svg/healer.svg';
import wizardIcon from '@/assets/svg/wizard.svg';
import * as Analytics from '@/libs/analytics';
export default {
components: {
Avatar,
@ -287,12 +285,6 @@ export default {
section: this.$t('lookingForPartyTitle'),
});
this.seekers = await this.$store.dispatch('party:lookingForParty');
await Analytics.track({
hitType: 'event',
eventName: 'View Find Members',
eventAction: 'View Find Members',
eventCategory: 'behavior',
}, { trackOnClient: true });
this.canLoadMore = this.seekers.length === 30;
this.loading = false;
}

17
website/client/src/components/header/index.vue
View file

@ -122,6 +122,7 @@
<script>
import orderBy from 'lodash/orderBy';
import * as Analytics from '@/libs/analytics';
import { mapGetters, mapActions } from '@/libs/store';
import MemberDetails from '../memberDetails';
import createPartyModal from '../groups/createPartyModal';
@ -232,10 +233,24 @@ export default {
this.expandedMember = memberId;
}
},
createOrInviteParty () {
async createOrInviteParty () {
if (this.user.party._id) {
await Analytics.track({
eventName: 'Header Party CTA',
eventAction: 'Header Party CTA',
eventCategory: 'behavior',
hitType: 'event',
state: 'Find Party Members',
});
this.$router.push('/looking-for-party');
} else {
await Analytics.track({
eventName: 'Header Party CTA',
eventAction: 'Header Party CTA',
eventCategory: 'behavior',
hitType: 'event',
state: 'Get Started',
});
this.$root.$emit('bv::show::modal', 'create-party-modal');
}
},

1
website/client/src/components/tasks/task.vue
View file

@ -6,6 +6,7 @@
'groupTask': task.group.id,
'task-not-editable': !teamManagerAccess,
'task-not-scoreable': showTaskLockIcon,
'link-exempt': !isChallengeTask && !isGroupTask,
}, `type_${task.type}`
]"
@click="castEnd($event, task)"

4
website/client/src/components/tasks/yesterdailyModal.vue
View file

@ -110,7 +110,9 @@ export default {
};
},
updated () {
this.handleExternalLinks();
window.setTimeout(() => {
this.handleExternalLinks();
}, 500);
},
computed: {
...mapState({ user: 'user.data' }),

1
website/client/src/mixins/externalLinks.js
View file

@ -16,6 +16,7 @@ export default {
}
if ((link.classList.value.indexOf('external-link') === -1)
&& (!link.offsetParent || link.offsetParent.classList.value.indexOf('link-exempt') === -1)
&& domainIndex !== 1
&& !some(TRUSTED_DOMAINS.split(','), domain => link.href.indexOf(domain) === domainIndex)) {
link.classList.add('external-link');

10
website/client/src/router/index.js
View file

@ -1,5 +1,6 @@
import Vue from 'vue';
import VueRouter from 'vue-router';
import * as Analytics from '@/libs/analytics';
import getStore from '@/store';
import handleRedirect from './handleRedirect';
@ -439,6 +440,15 @@ router.beforeEach(async (to, from, next) => {
router.app.$root.$emit('update-party');
}
if (to.name === 'lookingForParty') {
Analytics.track({
hitType: 'event',
eventName: 'View Find Members',
eventAction: 'View Find Members',
eventCategory: 'behavior',
}, { trackOnClient: true });
}
// Redirect old guild urls
if (to.hash.indexOf('#/options/groups/guilds/') !== -1) {
const splits = to.hash.split('/');

8
website/common/locales/en/backgrounds.json
View file

@ -875,6 +875,14 @@
"backgroundUnderWisteriaText": "Under Wisteria",
"backgroundUnderWisteriaNotes": "Relax Under Wisteria.",
"backgrounds052023": "SET 108: Released May 2023",
"backgroundInAPaintingText": "In A Painting",
"backgroundInAPaintingNotes": "Enjoy creative pursuits Inside a Painting.",
"backgroundFlyingOverHedgeMazeText": "Flying Over Hedge Maze",
"backgroundFlyingOverHedgeMazeNotes": "Marvel while Flying over a Hedge Maze.",
"backgroundCretaceousForestText": "Cretaceous Forest",
"backgroundCretaceousForestNotes": "Take in the ancient greenery of a Cretaceous Forest.",
"timeTravelBackgrounds": "Steampunk Backgrounds",
"backgroundAirshipText": "Airship",
"backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

10
website/common/locales/en/gear.json
View file

@ -694,6 +694,8 @@
"weaponArmoireMagicSpatulaNotes": "Watch your food fly and flip in the air. You get good luck for the day if it magically flips over three times and then lands back on your spatula. Increases Perception by <%= per %>. Enchanted Armoire: Cooking Implements Set (Item 1 of 2).",
"weaponArmoireFinelyCutGemText": "Finely Cut Gem",
"weaponArmoireFinelyCutGemNotes": "What a find! This stunning, precision-cut gem will be the prize of your collection. And it might contain some special magic, just waiting for you to tap into it. Increases Constitution by <%= con %>. Enchanted Armoire: Jeweler Set (Item 4 of 4).",
"weaponArmoirePaintbrushText": "Paintbrush",
"weaponArmoirePaintbrushNotes": "A jolt of pure inspiration rushes through you when you pick up this brush, allowing you to paint anything you can imagine. Increases Intelligence by <%= int %>. Enchanted Armoire: Painter Set (Item 3 of 4).",
"armor": "armor",
"armorCapitalized": "Armor",
@ -1453,6 +1455,8 @@
"armorArmoireTeaGownNotes": "You’re resilient, creative, brilliant, and so fashionable! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Tea Party Set (Item 1 of 3).",
"armorArmoireBasketballUniformText": "Basketball Uniform",
"armorArmoireBasketballUniformNotes": "Wondering what’s printed on the back of this uniform? It’s your lucky number, of course! Increases Perception by <% per %>. Enchanted Armoire: Old Timey Basketball Set (Item 1 of 2).",
"armorArmoirePaintersApronText": "Painter's Apron",
"armorArmoirePaintersApronNotes": "This apron can protect your clothes from paint and your creative projects from harsh critiques. Increases Constitution by <%= con %>. Enchanted Armoire: Painter Set (Item 1 of 4).",
"headgear": "helm",
"headgearCapitalized": "Headgear",
@ -2232,6 +2236,8 @@
"headArmoireTeaHatNotes": "This elegant hat is both fancy and functional. Increases Perception by <%= per %>. Enchanted Armoire: Tea Party Set (Item 2 of 3).",
"headArmoireBeaniePropellerHatText": "Beanie Propeller Hat",
"headArmoireBeaniePropellerHatNotes": "This isn’t the time to keep your feet on the ground! Spin this little propeller and rise as high as your ambitions will take you. Increases all stats by <%= attrs %>. Enchanted Armoire: Independent Item.",
"headArmoirePaintersBeretText": "Painter's Beret",
"headArmoirePaintersBeretNotes": "See the world with a more artistic eye when you wear this jaunty beret. Increases Perception by <%= per %>. Enchanted Armoire: Painter Set (Item 2 of 4).",
"offhand": "off-hand item",
"offHandCapitalized": "Off-Hand Item",
@ -2646,7 +2652,9 @@
"shieldArmoireTeaKettleText": "Tea Kettle",
"shieldArmoireTeaKettleNotes": "All your favorite, flavorful teas can be brewed in this kettle. Are you in the mood for black tea, green tea, oolong, or perhaps an herbal infusion? Increases Constitution by <%= con %>. Enchanted Armoire: Tea Party Set (Item 3 of 3).",
"shieldArmoireBasketballText": "Basketball",
"shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",
"shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",
"shieldArmoirePaintersPaletteText": "Painter's Palette",
"shieldArmoirePaintersPaletteNotes": "Paints in all colors of the rainbow are at your disposal. Is it magic that makes them so vivid when you use them, or is it your talent? Increases Strength by <%= str %>. Enchanted Armoire: Painter Set (Item 4 of 4).",
"back": "Back Accessory",
"backBase0Text": "No Back Accessory",

5
website/common/script/content/appearance/backgrounds.js
View file

@ -555,6 +555,11 @@ const backgrounds = {
springtime_shower: { },
under_wisteria: { },
},
backgrounds052023: {
in_a_painting: { },
flying_over_hedge_maze: { },
cretaceous_forest: { },
},
eventBackgrounds: {
birthday_bash: {
price: 0,

16
website/common/script/content/gear/sets/armoire.js
View file

@ -420,6 +420,10 @@ const armor = {
per: 10,
set: 'oldTimeyBasketball',
},
paintersApron: {
con: 10,
set: 'painters',
},
};
const body = {
@ -851,6 +855,10 @@ const head = {
str: 3,
int: 3,
},
paintersBeret: {
per: 9,
set: 'painters',
},
};
const shield = {
@ -1161,6 +1169,10 @@ const shield = {
str: 5,
set: 'oldTimeyBasketball',
},
paintersPalette: {
str: 7,
set: 'painters',
},
};
const headAccessory = {
@ -1603,6 +1615,10 @@ const weapon = {
con: 10,
set: 'jewelers',
},
paintbrush: {
int: 8,
set: 'painters',
},
};
forEach({