Merge branch 'develop' into release

website/client/src/components/avatarModal/extra-settings.vue

@@ -151,7 +151,13 @@ export default {
         'blackTopFrame', 'blueTopFrame', 'greenTopFrame', 'pinkTopFrame', 'redTopFrame', 'whiteTopFrame', 'yellowTopFrame',
         'blackHalfMoon', 'blueHalfMoon', 'greenHalfMoon', 'pinkHalfMoon', 'redHalfMoon', 'whiteHalfMoon', 'yellowHalfMoon',
       ];
-      const options = keys.map(key => {
+      const noneOption = this.createGearItem(0, 'eyewear', 'base');
+      noneOption.none = true;
+      const options = [
+        noneOption,
+      ];
+
+      for (const key of keys) {
         const newKey = `eyewear_special_${key}`;
         const option = {};
         option.key = key;
@@ -164,8 +170,9 @@ export default {
 
           return this.equip(newKey, type);
         };
-        return option;
-      });
+        options.push(option);
+      }
+
       return options;
     },
     freeShirts () {
@@ -179,20 +186,18 @@ export default {
     },
     headbands () {
       const keys = ['blackHeadband', 'blueHeadband', 'greenHeadband', 'pinkHeadband', 'redHeadband', 'whiteHeadband', 'yellowHeadband'];
-      const options = keys.map(key => {
-        const newKey = `headAccessory_special_${key}`;
-        const option = {};
-        option.key = key;
-        option.active = this.user.preferences.costume
-          ? this.user.items.gear.costume.headAccessory === newKey
-          : this.user.items.gear.equipped.headAccessory === newKey;
-        option.class = `headAccessory_special_${option.key} headband`;
-        option.click = () => {
-          const type = this.user.preferences.costume ? 'costume' : 'equipped';
-          return this.equip(newKey, type);
-        };
-        return option;
-      });
+      const noneOption = this.createGearItem(0, 'headAccessory', 'base', 'headband');
+      noneOption.none = true;
+      const options = [
+        noneOption,
+      ];
+
+      for (const key of keys) {
+        const option = this.createGearItem(key, 'headAccessory', 'special', 'headband');
+
+        options.push(option);
+      }
+
       return options;
     },
     chairs () {
@@ -234,7 +239,14 @@ export default {
       // user purchases object, this is not recomputed. Hack for now
         let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
       const keys = this.animalItemKeys[category];
-      const options = keys.map(key => {
+
+      const noneOption = this.createGearItem(0, category, 'base', category);
+      noneOption.none = true;
+      const options = [
+        noneOption,
+      ];
+
+      for (const key of keys) {
         const newKey = `${category}_special_${key}`;
         const userPurchased = this.user.items.gear.owned[newKey];
 
@@ -265,8 +277,10 @@ export default {
           const type = this.user.preferences.costume ? 'costume' : 'equipped';
           return this.equip(newKey, type);
         };
-        return option;
-      });
+
+        options.push(option);
+      }
+
       return options;
     },
     animalItemsUnlockString (category) {
@@ -285,6 +299,44 @@ export default {
       });
       return own;
     },
+    createGearItem (key, gearType, subGearType, additionalClass) {
+      const newKey = `${gearType}_${subGearType ? `${subGearType}_` : ''}${key}`;
+      const option = {};
+      option.key = key;
+      const visibleGearType = this.user.preferences.costume ? 'costume' : 'equipped';
+      const currentlyEquippedValue = this.user.items.gear[visibleGearType][gearType];
+
+      option.active = currentlyEquippedValue === newKey;
+
+      if (key === 0) {
+        // if key is the "none" option check if a property
+        // doesn't have a value and mark it as active
+        option.active = option.active || !currentlyEquippedValue;
+      }
+
+      option.class = `${newKey} ${additionalClass}`;
+      option.click = () => {
+        const type = this.user.preferences.costume ? 'costume' : 'equipped';
+        const currentlyEquipped = this.user.items.gear[type][gearType];
+
+        // no need to call api/equip-op if its already selected
+        if (currentlyEquipped === newKey || (key === 0 && !currentlyEquipped)) {
+          return;
+        }
+
+        let keyToEquip = newKey;
+
+        if (option.none) {
+          // you need to "equip" the current selected AGAIN in order to un-equip it
+          // the "none-key" isn't allowed to be sent
+          keyToEquip = currentlyEquipped;
+        }
+
+        this.equip(keyToEquip, type);
+      };
+
+      return option;
+    },
   },
 };
 </script>

website/client/src/components/challenges/challengeDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="row">
     <challenge-modal @updatedChallenge="updatedChallenge" />
-    <leave-challenge-modal :challenge-id="challenge._id" />
+    <leave-challenge-modal :challenge-id="challenge._id" @update-challenge="updateChallenge" />
     <close-challenge-modal
       :members="members"
       :challenge-id="challenge._id"
@@ -493,12 +493,20 @@ export default {
     },
     async joinChallenge () {
       this.user.challenges.push(this.searchId);
-      await this.$store.dispatch('challenges:joinChallenge', { challengeId: this.searchId });
+      this.challenge = await this.$store.dispatch('challenges:joinChallenge', { challengeId: this.searchId });
+      this.members = await this
+        .loadMembers({ challengeId: this.searchId, includeAllPublicFields: true });
+
       await this.$store.dispatch('tasks:fetchUserTasks', { forceLoad: true });
     },
     async leaveChallenge () {
       this.$root.$emit('bv::show::modal', 'leave-challenge-modal');
     },
+    async updateChallenge () {
+      this.challenge = await this.$store.dispatch('challenges:getChallenge', { challengeId: this.searchId });
+      this.members = await this
+        .loadMembers({ challengeId: this.searchId, includeAllPublicFields: true });
+    },
     closeChallenge () {
       this.$root.$emit('bv::show::modal', 'close-challenge-modal');
     },

website/client/src/components/challenges/leaveChallengeModal.vue

@@ -54,6 +54,7 @@ export default {
       this.close();
     },
     close () {
+      this.$emit('update-challenge');
       this.$root.$emit('bv::hide::modal', 'leave-challenge-modal');
     },
   },

website/client/src/components/tasks/taskModal.vue

@@ -1437,6 +1437,10 @@ export default {
         this.task.group.sharedCompletion = this.sharedCompletion;
       }
 
+      if (this.task.type === 'reward' && this.task.value === '') {
+        this.task.value = 0;
+      }
+
       if (this.purpose === 'create') {
         if (this.challengeId) {
           const response = await this.$store.dispatch('tasks:createChallengeTasks', {