diff --git a/habitica-images b/habitica-images index 311cb01059..dac6a71d1f 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 311cb010591a9de368a1ab5db7506d2d3efbb10b +Subproject commit dac6a71d1fa2500bf8f3ec18bf917cbe91d82d64 diff --git a/package-lock.json b/package-lock.json index e43131bc51..252ccb4a1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.269.0", + "version": "4.270.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fd55d4a746..0d5b651d85 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js index bbad7a8401..2c6313154b 100644 --- a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js +++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js @@ -2,7 +2,6 @@ import { v4 as generateUUID } from 'uuid'; import { generateUser, createAndPopulateGroup, - checkExistence, translate as t, } from '../../../../helpers/api-integration/v3'; diff --git a/test/api/v3/integration/groups/POST-groups_invite.test.js b/test/api/v3/integration/groups/POST-groups_invite.test.js index 58a478be00..179e6dfdee 100644 --- a/test/api/v3/integration/groups/POST-groups_invite.test.js +++ b/test/api/v3/integration/groups/POST-groups_invite.test.js @@ -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({ diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 8a5531760f..b3c0c74c78 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -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; diff --git a/website/client/src/components/groups/createPartyModal.vue b/website/client/src/components/groups/createPartyModal.vue index 17c0184331..c1021b47e7 100644 --- a/website/client/src/components/groups/createPartyModal.vue +++ b/website/client/src/components/groups/createPartyModal.vue @@ -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 () { diff --git a/website/client/src/components/groups/lookingForParty.vue b/website/client/src/components/groups/lookingForParty.vue index eda06f5759..fd22c7656a 100644 --- a/website/client/src/components/groups/lookingForParty.vue +++ b/website/client/src/components/groups/lookingForParty.vue @@ -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; } diff --git a/website/client/src/components/header/index.vue b/website/client/src/components/header/index.vue index ebf2362e32..7d95387d9c 100644 --- a/website/client/src/components/header/index.vue +++ b/website/client/src/components/header/index.vue @@ -122,6 +122,7 @@