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

package-lock.json

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

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.269.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.4",

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';
 

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({

website/client/src/components/groups/createPartyModal.vue

@@ -265,12 +265,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 () {

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;
     }

website/client/src/components/header/index.vue

@@ -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');
       }
     },

website/client/src/router/index.js

@@ -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';
 
@@ -297,6 +298,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('/');