4.1.3

migrations/20170928_redesign_launch.js

@@ -1,5 +1,4 @@
-import { selectGearToPin } from '../website/common/script/ops/pinnedGearUtils';
-
+var updateStore = require('../website/common/script/libs/updateStore');
 var getItemInfo = require('../website/common/script/libs/getItemInfo');
 
 var migrationName = '20170928_redesign_launch.js';
@@ -70,7 +69,7 @@ function updateUser (user) {
 
   var set = {'migration': migrationName};
 
-  var oldRewardsList = selectGearToPin(user);
+  var oldRewardsList = updateStore(user);
   var newPinnedItems = [
     {
       type: 'armoire',

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.2.0",
+  "version": "4.1.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -68,15 +68,6 @@
         "@types/mime": "1.3.1"
       }
     },
-    "JSONStream": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
-      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
-      "requires": {
-        "jsonparse": "1.3.1",
-        "through": "2.3.8"
-      }
-    },
     "abbrev": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
@@ -791,14 +782,6 @@
         "is-buffer": "1.1.5"
       }
     },
-    "axios-progress-bar": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/axios-progress-bar/-/axios-progress-bar-0.1.7.tgz",
-      "integrity": "sha512-xStxJUtcQUH0ulLni5qc8YwvNMTUjO7rmUTsvnxS1bD2GJKEemozP6sJ5OeoC6jjd6MS5FZyx5BlkU/lD8JLUw==",
-      "requires": {
-        "nprogress": "0.2.0"
-      }
-    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -2342,9 +2325,9 @@
       "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz",
       "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
       "requires": {
-        "JSONStream": "1.3.1",
         "combine-source-map": "0.7.2",
         "defined": "1.0.0",
+        "JSONStream": "1.3.1",
         "through2": "2.0.3",
         "umd": "3.0.1"
       }
@@ -2374,7 +2357,6 @@
       "resolved": "https://registry.npmjs.org/browserify/-/browserify-12.0.2.tgz",
       "integrity": "sha1-V/IeXm4wj/WYfE2v1EhAsrmPehk=",
       "requires": {
-        "JSONStream": "1.3.1",
         "assert": "1.3.0",
         "browser-pack": "6.0.2",
         "browser-resolve": "1.11.2",
@@ -2396,6 +2378,7 @@
         "inherits": "2.0.3",
         "insert-module-globals": "7.0.1",
         "isarray": "0.0.1",
+        "JSONStream": "1.3.1",
         "labeled-stream-splicer": "2.0.0",
         "module-deps": "4.1.1",
         "os-browserify": "0.1.2",
@@ -7406,6 +7389,13 @@
             }
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -7415,13 +7405,6 @@
             "strip-ansi": "3.0.1"
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -10370,10 +10353,10 @@
       "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz",
       "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
       "requires": {
-        "JSONStream": "1.3.1",
         "combine-source-map": "0.7.2",
         "concat-stream": "1.5.2",
         "is-buffer": "1.1.5",
+        "JSONStream": "1.3.1",
         "lexical-scope": "1.2.0",
         "process": "0.11.10",
         "through2": "2.0.3",
@@ -11366,6 +11349,15 @@
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
       "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
     },
+    "JSONStream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
+      "requires": {
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -13265,7 +13257,6 @@
       "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
       "requires": {
-        "JSONStream": "1.3.1",
         "browser-resolve": "1.11.2",
         "cached-path-relative": "1.0.1",
         "concat-stream": "1.5.2",
@@ -13273,6 +13264,7 @@
         "detective": "4.5.0",
         "duplexer2": "0.1.4",
         "inherits": "2.0.3",
+        "JSONStream": "1.3.1",
         "parents": "1.0.1",
         "readable-stream": "2.0.6",
         "resolve": "1.4.0",
@@ -14648,11 +14640,6 @@
         "set-blocking": "2.0.0"
       }
     },
-    "nprogress": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-      "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
-    },
     "nth-check": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
@@ -17247,6 +17234,22 @@
         }
       }
     },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "requires": {
+        "resolve-from": "2.0.0",
+        "semver": "5.4.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+          "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+        }
+      }
+    },
     "require-again": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-again/-/require-again-2.0.0.tgz",
@@ -17286,22 +17289,6 @@
         }
       }
     },
-    "require_optional": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
-      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
-      "requires": {
-        "resolve-from": "2.0.0",
-        "semver": "5.4.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.4.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-          "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
-        }
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -18668,6 +18655,11 @@
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+    },
     "string-length": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz",
@@ -18701,11 +18693,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
     "stringify-object": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.2.0",
+  "version": "4.1.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",
@@ -14,7 +14,6 @@
     "autoprefixer": "^6.4.0",
     "aws-sdk": "^2.0.25",
     "axios": "^0.16.0",
-    "axios-progress-bar": "^0.1.7",
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.2.3",
     "babel-loader": "^6.0.0",

website/client/app.vue

@@ -68,8 +68,6 @@
 
 <script>
 import axios from 'axios';
-import { loadProgressBar } from 'axios-progress-bar';
-
 import AppMenu from './components/appMenu';
 import AppHeader from './components/appHeader';
 import AppFooter from './components/appFooter';
@@ -131,7 +129,6 @@ export default {
       this.$refs.sound.load();
     });
 
-    // @TODO: I'm not sure these should be at the app level. Can we move these back into shop/inventory or maybe they need a lateral move?
     this.$root.$on('buyModal::showItem', (item) => {
       this.selectedItemToBuy = item;
       this.$root.$emit('show::modal', 'buy-modal');
@@ -143,9 +140,6 @@ export default {
     });
 
     // @TODO split up this file, it's too big
-
-    loadProgressBar();
-
     // Set up Error interceptors
     axios.interceptors.response.use((response) => {
       if (this.user && response.data && response.data.notifications) {
@@ -326,12 +320,10 @@ export default {
         }
       }
     },
-    async memberSelected (member) {
+    memberSelected (member) {
       this.$store.dispatch('user:castSpell', {key: this.selectedSpellToBuy.key, targetId: member.id});
       this.selectedSpellToBuy = null;
 
-      this.$store.dispatch('party:getMembers', {forceLoad: true});
-
       this.$root.$emit('hide::modal', 'select-member-modal');
     },
     hideLoadingScreen () {

website/client/assets/scss/index.scss

@@ -13,7 +13,6 @@
 @import './loading-screen';
 
 // Global styles
-@import './misc';
 @import './typography';
 @import './markdown';
 @import './form';

website/client/assets/scss/misc.scss

@@ -1,17 +0,0 @@
-.expand-toggle:after {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  content: "";
-  border-bottom: 4px solid transparent;
-  border-top: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-left: 4px solid;
-}
-
-.expand-toggle.open:after {
-  border-top: 4px solid;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  border-bottom: 0;
-}

website/client/assets/svg/checklist.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="8" viewBox="0 0 12 8">
-    <path fill="#878190" fill-rule="evenodd" d="M3 6h9v2H3V6zm0-3h7v2H3V3zm0-3h5v2H3V0zM0 6h2v2H0V6zm0-3h2v2H0V3zm0-3h2v2H0V0z"/>
-</svg>

website/client/components/appHeader.vue

@@ -29,27 +29,11 @@ div
         br
         // TODO link to party creation or party page if partying solo
         button.btn.btn-primary(@click='openPartyModal()') {{ partyMembers && partyMembers.length > 1 ? $t('startAParty') : $t('inviteFriends') }}
-  a.useMobileApp(v-if="isAndroidMobile()", v-once, href="https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica") {{ $t('useMobileApps') }}
-  a.useMobileApp(v-if="isIOSMobile()", v-once, href="https://itunes.apple.com/us/app/habitica-gamified-task-manager/id994882113?mt=8") {{ $t('useMobileApps') }}
-
 </template>
 
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
 
-  .useMobileApp {
-    background: red;
-    color: white;
-    z-index: 10;
-    width: 100%;
-    margin: 10px 5px 0 0;
-    height: 64px;
-    text-align: center;
-
-    display: flex;
-    align-items: center;
-  }
-
   #app-header {
     padding-left: 14px;
     margin-top: 56px;
@@ -133,7 +117,6 @@ export default {
       user: 'user:data',
       partyMembers: 'party:members',
     }),
-
     showHeader () {
       if (this.$store.state.hideHeader) return false;
       return true;
@@ -146,12 +129,6 @@ export default {
     ...mapActions({
       getPartyMembers: 'party:getMembers',
     }),
-    isAndroidMobile () {
-      return navigator.userAgent.match(/Android/i);
-    },
-    isIOSMobile () {
-      return navigator.userAgent.match(/iPhone|iPad|iPod/i);
-    },
     expandMember (memberId) {
       if (this.expandedMember === memberId) {
         this.expandedMember = null;

website/client/components/appMenu.vue

@@ -331,6 +331,7 @@ export default {
         hourglasses: svgHourglasses,
         logo,
       }),
+      groupPlans: [],
     };
   },
   computed: {
@@ -340,7 +341,6 @@ export default {
     ...mapState({
       user: 'user.data',
       userHourglasses: 'user.data.purchased.plan.consecutive.trinkets',
-      groupPlans: 'groupPlans',
     }),
   },
   mounted () {
@@ -367,7 +367,7 @@ export default {
       this.$root.$emit('show::modal', 'profile');
     },
     async getUserGroupPlans () {
-      this.$store.state.groupPlans = await this.$store.dispatch('guilds:getGroupPlans');
+      this.groupPlans = await this.$store.dispatch('guilds:getGroupPlans');
     },
     openPartyModal () {
       this.$root.$emit('show::modal', 'create-party-modal');

website/client/components/group-plans/billing.vue

@@ -1,74 +0,0 @@
-<template lang="pug">
-.row.standard-page(v-if='groupIsSubscribed && isLeader')
-  .col-12.col-md-6.offset-md-3
-    table.table.alert.alert-info
-      tr(v-if='group.purchased.plan.dateTerminated')
-        td.alert.alert-warning
-          span.noninteractive-button.btn-danger {{ $t('canceledGroupPlan') }}
-          i.glyphicon.glyphicon-time {{ $t('groupPlanCanceled') }}
-          strong {{dateTerminated}}
-      tr(v-if='!group.purchased.plan.dateTerminated')
-        td
-          h3 {{ $t('paymentDetails') }}
-          p(v-if='group.purchased.plan.planId') {{ $t('groupSubscriptionPrice') }}
-      tr(v-if='group.purchased.plan.extraMonths')
-        td
-          span.glyphicon.glyphicon-credit-card
-          | {{ $t('purchasedGroupPlanPlanExtraMonths', purchasedGroupPlanPlanExtraMonths) }}
-      tr(v-if='group.purchased.plan.consecutive.count || group.purchased.plan.consecutive.offset')
-        td
-          span.glyphicon.glyphicon-forward
-          | {{ $t('consecutiveSubscription') }}
-          ul.list-unstyled
-            li {{ $t('consecutiveMonths') }} {{group.purchased.plan.consecutive.count + group.purchased.plan.consecutive.offset}}
-            li {{ $t('gemCapExtra') }} {{group.purchased.plan.consecutive.gemCapExtra}}
-                li {{ $t('mysticHourglasses') }} {{group.purchased.plan.consecutive.trinkets}}
-  .col-12.col-md-6.offset-md-3
-    .btn.btn-primary(v-if='!group.purchased.plan.dateTerminated && group.purchased.plan.paymentMethod === "Stripe"',
-      @click='showStripeEdit({groupId: group.id})') {{ $t('subUpdateCard') }}
-    .btn.btn-sm.btn-danger(v-if='!group.purchased.plan.dateTerminated',
-      @click='cancelSubscription({group: group})') {{ $t('cancelGroupSub') }}
-</template>
-
-<script>
-import moment from 'moment';
-import { mapState } from 'client/libs/store';
-import paymentsMixin from 'client/mixins/payments';
-
-export default {
-  mixins: [paymentsMixin],
-  props: ['groupId'],
-  data () {
-    return {
-      group: {},
-    };
-  },
-  mounted () {
-    this.loadGroup();
-  },
-  computed: {
-    ...mapState({user: 'user.data'}),
-    isLeader () {
-      return this.user._id === this.group.leader._id;
-    },
-    groupIsSubscribed () {
-      return this.group.purchased && this.group.purchased.plan && this.group.purchased.plan.customerId;
-    },
-    dateTerminated () {
-      if (!this.user.preferences || !this.user.preferences.dateFormat) return moment(this.group.purchased.plan.dateTerminated);
-      return moment(this.group.purchased.plan.dateTerminated).format(this.user.preferences.dateFormat.toUpperCase());
-    },
-    purchasedGroupPlanPlanExtraMonths () {
-      return {
-        months: parseFloat(this.group.purchased.plan.extraMonths).toFixed(2),
-      };
-    },
-  },
-  methods: {
-    async loadGroup () {
-      let group = await this.$store.dispatch('guilds:getGroup', {groupId: this.groupId});
-      this.group = Object.assign({}, group);
-    },
-  },
-};
-</script>

website/client/components/group-plans/index.vue

@@ -2,14 +2,9 @@
 .row
   secondary-menu.col-12
     router-link.nav-link(:to="{name: 'groupPlanDetailTaskInformation', params: {groupId}}",
-      exact, :class="{'active': $route.name === 'groupPlanDetailTaskInformation'}") {{ $t('groupTaskBoard') }}
+      exact, :class="{'active': $route.name === 'groupPlanDetailTaskInformation'}") Task Board
     router-link.nav-link(:to="{name: 'groupPlanDetailInformation', params: {groupId}}",
-      exact, :class="{'active': $route.name === 'groupPlanDetailInformation'}") {{ $t('groupInformation') }}
-    router-link.nav-link(
-      v-if='isLeader',
-      :to="{name: 'groupPlanBilling', params: {groupId}}",
-      exact,
-      :class="{'active': $route.name === 'groupPlanBilling'}") {{ $t('groupBilling') }}
+      exact, :class="{'active': $route.name === 'groupPlanDetailInformation'}") Group Information
 
   .col-12
     router-view
@@ -17,26 +12,11 @@
 
 <script>
 import SecondaryMenu from 'client/components/secondaryMenu';
-import { mapState } from 'client/libs/store';
 
 export default {
   props: ['groupId'],
   components: {
     SecondaryMenu,
   },
-  computed: {
-    ...mapState({
-      user: 'user.data',
-      groupPlans: 'groupPlans',
-    }),
-    isLeader () {
-      let groupFound = this.groupPlans.find(group => {
-        return group._id === this.groupId;
-      });
-
-      if (!groupFound) return false;
-      return groupFound.leader === this.user._id;
-    },
-  },
 };
 </script>

website/client/components/group-plans/taskInformation.vue

@@ -349,21 +349,15 @@ export default {
         groupId: this.searchId,
       });
 
-      let groupedApprovals = this.loadApprovals();
-
-      tasks.forEach((task) => {
-        if (groupedApprovals.length > 0) task.approvals = groupedApprovals[task._id];
-        this.tasksByType[task.type].push(task);
-      });
-    },
-    async loadApprovals () {
-      if (this.group.leader._id !== this.user._id) return [];
-
       let approvalRequests = await this.$store.dispatch('tasks:getGroupApprovals', {
         groupId: this.searchId,
       });
+      let groupedApprovals = groupBy(approvalRequests, 'group.taskId');
 
-      return groupBy(approvalRequests, 'group.taskId');
+      tasks.forEach((task) => {
+        task.approvals = groupedApprovals[task._id];
+        this.tasksByType[task.type].push(task);
+      });
     },
     editTask (task) {
       this.taskFormPurpose = 'edit';

website/client/components/notificationMenu.vue

@@ -1,7 +1,8 @@
 <template lang="pug">
 div.item-with-icon.item-notifications.dropdown
-  span.message-count.top-count(v-if='notificationsCount > 0')  {{ notificationsCount }}
   .svg-icon.notifications(v-html="icons.notifications")
+  // span.glyphicon(:class='iconClasses()')
+  // span.notification-counter(v-if='getNotificationsCount()') {{getNotificationsCount()}}
   .dropdown-menu.dropdown-menu-right.user-dropdown
     h4.dropdown-item.dropdown-separated(v-if='!hasNoNotifications()') {{ $t('notifications') }}
     h4.dropdown-item.toolbar-notifs-no-messages(v-if='hasNoNotifications()') {{ $t('noNotifications') }}
@@ -57,25 +58,6 @@ div.item-with-icon.item-notifications.dropdown
 <style lang='scss' scoped>
   @import '~client/assets/scss/colors.scss';
 
-  .message-count {
-    background-color: #46a7d9;
-    border-radius: 50%;
-    height: 20px;
-    width: 20px;
-    float: right;
-    color: #fff;
-    text-align: center;
-    font-weight: bold;
-    font-size: 12px;
-  }
-
-  .message-count.top-count {
-    position: absolute;
-    right: -.5em;
-    top: .5em;
-    padding: .2em;
-  }
-
   .clear-button {
     margin-left: .5em;
   }
@@ -186,31 +168,6 @@ export default {
       }
       return userNewMessages;
     },
-    notificationsCount () {
-      let count = 0;
-
-      if (this.user.invitations.parties) {
-        count += this.user.invitations.parties.length;
-      }
-
-      if (this.user.purchased.plan && this.user.purchased.plan.mysteryItems.length) {
-        count++;
-      }
-
-      if (this.user.invitations.guilds) {
-        count += this.user.invitations.guilds.length;
-      }
-
-      if (this.user.flags.classSelected && !this.user.preferences.disableClasses && this.user.stats.points) {
-        count += this.user.stats.points > 0 ? 1 : 0;
-      }
-
-      if (this.userNewMessages) {
-        count += Object.keys(this.userNewMessages).length;
-      }
-
-      return count;
-    },
   },
   methods: {
     // @TODO: I hate this function, we can do better with a hashmap
@@ -280,6 +237,31 @@ export default {
     clearCards () {
       this.$store.dispatch('chat:clearCards');
     },
+    getNotificationsCount () {
+      let count = 0;
+
+      if (this.user.invitations.parties) {
+        count += this.user.invitations.parties.length;
+      }
+
+      if (this.user.purchased.plan && this.user.purchased.plan.mysteryItems.length) {
+        count++;
+      }
+
+      if (this.user.invitations.guilds) {
+        count += this.user.invitations.guilds.length;
+      }
+
+      if (this.user.flags.classSelected && !this.user.preferences.disableClasses && this.user.stats.points) {
+        count += this.user.stats.points > 0 ? 1 : 0;
+      }
+
+      if (this.userNewMessages) {
+        count += Object.keys(this.userNewMessages).length;
+      }
+
+      return count;
+    },
     iconClasses () {
       return this.selectNotificationValue(
         'glyphicon-gift',

website/client/components/payments/buyGemsModal.vue

@@ -21,12 +21,6 @@
             .nav-item(@click='selectedPage = "subscribe"', :class="{active: selectedPage === 'subscribe'}") {{ $t('subscribe') }}
             .nav-item(@click='selectedPage = "gems"', :class="{active: selectedPage === 'gems'}") {{ $t('buyGems') }}
         div(v-show='selectedPage === "gems"')
-          div(v-if='hasSubscription')
-            .row.text-center
-              h2.mx-auto.text-leadin {{ $t('subscriptionAlreadySubscribedLeadIn') }}
-            .row.text-center
-              .col-6.offset-3
-                p {{ $t("gemsPurchaseNote") }}
           .row.text-center
             h2.mx-auto.text-leadin {{ $t('gemBenefitLeadin') }}
           .row

website/client/components/settings/subscription.vue

@@ -112,6 +112,7 @@ import filter from 'lodash/filter';
 import sortBy from 'lodash/sortBy';
 import min from 'lodash/min';
 import { mapState } from 'client/libs/store';
+import encodeParams from 'client/libs/encodeParams';
 
 import subscriptionBlocks from '../../../common/script/content/subscriptionBlocks';
 import planGemLimits from '../../../common/script/libs/planGemLimits';
@@ -260,6 +261,42 @@ export default {
       subs.basic_6mo.discount = true;
       subs.google_6mo.discount = false;
     },
+    async cancelSubscription (config) {
+      if (config && config.group && !confirm(this.$t('confirmCancelGroupPlan'))) return;
+      if (!confirm(this.$t('sureCancelSub'))) return;
+
+      let group;
+      if (config && config.group) {
+        group = config.group;
+      }
+
+      let paymentMethod = this.user.purchased.plan.paymentMethod;
+      if (group) {
+        paymentMethod = group.purchased.plan.paymentMethod;
+      }
+
+      if (paymentMethod === 'Amazon Payments') {
+        paymentMethod = 'amazon';
+      } else {
+        paymentMethod = paymentMethod.toLowerCase();
+      }
+
+      let queryParams = {
+        _id: this.user._id,
+        apiToken: this.credentials.API_TOKEN,
+        noRedirect: true,
+      };
+
+      if (group) {
+        queryParams.groupId = group._id;
+      }
+
+      let cancelUrl = `/${paymentMethod}/subscribe/cancel?${encodeParams(queryParams)}`;
+      await axios.get(cancelUrl);
+      //  Success
+      alert(this.$t('paypalCanceled'));
+      this.$router.push('/');
+    },
     getCancelSubInfo () {
       // @TODO: String 'cancelSubInfoGroup Plan' not found. ?
       return this.$t(`cancelSubInfo${this.user.purchased.plan.paymentMethod}`);

website/client/components/shops/buyModal.vue

@@ -14,6 +14,7 @@
       span.svg-icon.inline.icon-10(aria-hidden="true", v-html="icons.close", @click="hideDialog()")
 
     div.content(v-if="item != null")
+
       div.inner-content
         slot(name="item", :item="item")
           div(v-if="showAvatar")
@@ -45,11 +46,6 @@
           span.svg-icon.inline.icon-32(aria-hidden="true", v-html="icons[getPriceClass()]")
           span.value(:class="getPriceClass()") {{ item.value }}
 
-        .gems-left(v-if='item.key === "gem"')
-          strong(v-if='gemsLeft > 0') {{ gemsLeft }} {{ $t('gemsRemaining') }}
-          strong(v-if='gemsLeft === 0') {{ $t('maxBuyGems') }}
-
-
         button.btn.btn-primary(
           @click="purchaseGems()",
           v-if="getPriceClass() === 'gems' && !this.enoughCurrency(getPriceClass(), item.value)"
@@ -58,7 +54,6 @@
         button.btn.btn-primary(
           @click="buyItem()",
           v-else,
-          :disabled='item.key === "gem" && gemsLeft === 0',
           :class="{'notEnough': !preventHealthPotion || !this.enoughCurrency(getPriceClass(), item.value)}"
         ) {{ $t('buyNow') }}
 
@@ -208,10 +203,6 @@
     .bordered {
       margin-top: 8px;
     }
-
-    .gems-left {
-      margin-top: .5em;
-    }
   }
 </style>
 
@@ -219,7 +210,6 @@
   import bModal from 'bootstrap-vue/lib/components/modal';
   import * as Analytics from 'client/libs/analytics';
   import spellsMixin from 'client/mixins/spells';
-  import planGemLimits from 'common/script/libs/planGemLimits';
 
   import svgClose from 'assets/svg/close.svg';
   import svgGold from 'assets/svg/gold.svg';
@@ -302,10 +292,6 @@
       limitedString () {
         return this.$t('limitedOffer', {date: moment(seasonalShopConfig.dateRange.end).format('LL')});
       },
-      gemsLeft () {
-        if (!this.user.purchased.plan) return 0;
-        return planGemLimits.convCap + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
-      },
     },
     watch: {
       item: function itemChanged () {

website/client/components/shops/market/index.vue

@@ -383,8 +383,6 @@
   const sortGearTypes = ['sortByType', 'sortByPrice', 'sortByCon', 'sortByPer', 'sortByStr', 'sortByInt'];
 
   import notifications from 'client/mixins/notifications';
-  import buyMixin from 'client/mixins/buy';
-  import currencyMixin from '../_currencyMixin';
 
   const sortGearTypeMap = {
     sortByType: 'type',
@@ -395,7 +393,7 @@
   };
 
 export default {
-    mixins: [notifications, buyMixin, currencyMixin],
+    mixins: [notifications],
     components: {
       ShopItem,
       Item,
@@ -696,11 +694,6 @@ export default {
         }
       },
       itemSelected (item) {
-        if (item.purchaseType !== 'gear' && this.$store.state.recentlyPurchased[item.key]) {
-          this.makeGenericPurchase(item);
-          return;
-        }
-
         this.$root.$emit('buyModal::showItem', item);
       },
       featuredItemSelected (item) {

website/client/components/shops/quests/buyQuestModal.vue

@@ -43,9 +43,11 @@
         :currencyNeeded="priceType",
         :amountNeeded="item.value"
       ).float-right
-</template>
 
+
+</template>
 <style lang="scss">
+
   @import '~client/assets/scss/colors.scss';
   @import '~client/assets/scss/modal.scss';
 
@@ -171,6 +173,7 @@
 </style>
 
 <script>
+
   import {mapState} from 'client/libs/store';
 
   import bModal from 'bootstrap-vue/lib/components/modal';
@@ -185,13 +188,12 @@
   import currencyMixin from '../_currencyMixin';
   import QuestInfo from './questInfo.vue';
   import notifications from 'client/mixins/notifications';
-  import buyMixin from 'client/mixins/buy';
 
   import questDialogDrops from './questDialogDrops';
   import questDialogContent from './questDialogContent';
 
   export default {
-    mixins: [currencyMixin, notifications, buyMixin],
+    mixins: [currencyMixin, notifications],
     components: {
       bModal,
       BalanceInfo,
@@ -241,8 +243,15 @@
         this.$emit('change', $event);
       },
       buyItem () {
-        this.makeGenericPurchase(this.item, 'buyQuestModal');
+        this.$store.dispatch('shops:genericPurchase', {
+          pinType: this.item.pinType,
+          type: this.item.purchaseType,
+          key: this.item.key,
+          currency: this.item.currency,
+        });
         this.purchased(this.item.text);
+        this.$root.$emit('playSound', 'Reward');
+        this.$emit('buyPressed', this.item);
         this.hideDialog();
       },
       togglePinned () {

website/client/components/shops/quests/index.vue

@@ -328,8 +328,6 @@
   import ItemRows from 'client/components/ui/itemRows';
   import toggleSwitch from 'client/components/ui/toggleSwitch';
   import Avatar from 'client/components/avatar';
-  import buyMixin from 'client/mixins/buy';
-  import currencyMixin from '../_currencyMixin';
 
   import BuyModal from './buyQuestModal.vue';
   import QuestInfo from './questInfo.vue';
@@ -350,7 +348,6 @@
   import _map from 'lodash/map';
 
 export default {
-    mixins: [buyMixin, currencyMixin],
     components: {
       ShopItem,
       Item,
@@ -473,11 +470,6 @@ export default {
       selectItem (item) {
         this.selectedItemToBuy = item;
 
-        if (this.$store.state.recentlyPurchased[item.key]) {
-          this.makeGenericPurchase(item);
-          return;
-        }
-
         this.$root.$emit('show::modal', 'buy-quest-modal');
       },
     },

website/client/components/shops/seasonal/index.vue

@@ -274,8 +274,6 @@
   import ItemRows from 'client/components/ui/itemRows';
   import toggleSwitch from 'client/components/ui/toggleSwitch';
   import Avatar from 'client/components/avatar';
-  import buyMixin from 'client/mixins/buy';
-  import currencyMixin from '../_currencyMixin';
 
   import bPopover from 'bootstrap-vue/lib/components/popover';
   import bDropdown from 'bootstrap-vue/lib/components/dropdown';
@@ -304,7 +302,6 @@
   import shops from 'common/script/libs/shops';
 
   export default {
-    mixins: [buyMixin, currencyMixin],
     components: {
       ShopItem,
       Item,
@@ -488,14 +485,9 @@
         }
       },
       itemSelected (item) {
-        if (item.locked) return;
-
-        if (this.$store.state.recentlyPurchased[item.key]) {
-          this.makeGenericPurchase(item);
-          return;
+        if (!item.locked) {
+          this.$root.$emit('buyModal::showItem', item);
         }
-
-        this.$root.$emit('buyModal::showItem', item);
       },
     },
   };

website/client/components/tasks/tagsPopup.vue

@@ -1,107 +0,0 @@
-<template lang="pug">
-.tags-popup
-  .tags-category.d-flex
-    .tags-header
-      strong(v-once) {{ $t('tags') }}
-    .tags-list.container
-      .row
-        .col-4(v-for="tag in tags")
-          label.custom-control.custom-checkbox
-            input.custom-control-input(type="checkbox", :value="tag.id", v-model="selectedTags")
-            span.custom-control-indicator
-            span.custom-control-description(:title='tag.name') {{tag.name}}
-  .tags-footer
-    span.clear-tags(@click="clearTags()") {{$t("clearTags")}}
-</template>
-
-<style lang="scss" scoped>
-  @import '~client/assets/scss/colors.scss';
-
-  .tags-popup {
-    padding-left: 24px;
-    padding-right: 24px;
-    max-width: 593px;
-    z-index: 9999;
-    background: $white;
-    border-radius: 2px;
-    box-shadow: 0 2px 2px 0 rgba($black, 0.16), 0 1px 4px 0 rgba($black, 0.12);
-    font-size: 14px;
-    line-height: 1.43;
-    text-overflow: ellipsis;
-
-    .tags-category {
-      border-bottom: 1px solid $gray-600;
-      padding-bottom: 24px;
-      padding-top: 24px;
-    }
-
-    .tags-header {
-       flex-basis: 96px;
-       flex-shrink: 0;
-
-      a {
-        font-size: 12px;
-        line-height: 1.33;
-        color: $blue-10;
-        margin-top: 4px;
-
-        &:focus, &:hover, &:active {
-          text-decoration: underline;
-        }
-      }
-    }
-
-    .tags-list {
-      .custom-control-description {
-        color: $gray-50 !important;
-        font-weight: normal;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: pre;
-        width: 8em;
-      }
-    }
-
-    .tags-footer {
-      border-top: 1px solid $gray-600;
-
-      display: flex;
-      justify-content: center;
-
-      .clear-tags {
-        cursor: pointer;
-        margin: 1.1em 0;
-        color: $red-50;
-        font-size: 14px;
-
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-</style>
-
-<script>
-export default {
-  props: ['tags', 'value'],
-  data () {
-    return {
-      selectedTags: [],
-    };
-  },
-  watch: {
-    selectedTags () {
-      this.$emit('input', this.selectedTags);
-    },
-  },
-  mounted () {
-    this.selectedTags = this.value;
-  },
-  methods: {
-    clearTags () {
-      this.selectedTags = [];
-    },
-  },
-};
-</script>

website/client/components/tasks/task.vue

@@ -17,16 +17,8 @@
           h3.task-title(:class="{ 'has-notes': task.notes }", v-markdown="task.text")
           .task-notes.small-text(v-markdown="task.notes")
         .checklist(v-if="canViewchecklist")
-          .d-inline-flex
-            .collapse-checklist.d-flex.align-items-center.expand-toggle(
-              v-if="isUser",
-              @click="collapseChecklist(task)",
-              :class="{open: !task.collapseChecklist}",
-            )
-              .svg-icon(v-html="icons.checklist")
-              span {{ checklistProgress }}
           label.custom-control.custom-checkbox.checklist-item(
-            v-if='!castingSpell && !task.collapseChecklist',
+            v-if='!castingSpell',
             v-for="item in task.checklist", :class="{'checklist-item-done': item.completed}",
           )
             input.custom-control-input(type="checkbox", :checked="item.completed", @change="toggleChecklistItem(item)")
@@ -127,26 +119,6 @@
     margin-top: 8px;
   }
 
-  .collapse-checklist {
-    padding: 2px 6px;
-    margin-bottom: 9px;
-    border-radius: 1px;
-    background-color: $gray-600;
-    font-size: 10px;
-    line-height: 1.2;
-    text-align: center;
-    color: $gray-200;
-
-    span {
-      margin: 0px 4px;
-    }
-
-    .svg-icon {
-      width: 12px;
-      height: 8px;
-    }
-  }
-
   .checklist-item {
     color: $gray-50;
     font-size: 14px;
@@ -336,7 +308,6 @@ import calendarIcon from 'assets/svg/calendar.svg';
 import challengeIcon from 'assets/svg/challenge.svg';
 import tagsIcon from 'assets/svg/tags.svg';
 import checkIcon from 'assets/svg/check.svg';
-import checklistIcon from 'assets/svg/checklist.svg';
 import bPopover from 'bootstrap-vue/lib/components/popover';
 import markdownDirective from 'client/directives/markdown';
 import notifications from 'client/mixins/notifications';
@@ -365,7 +336,6 @@ export default {
         challenge: challengeIcon,
         tags: tagsIcon,
         check: checkIcon,
-        checklist: checklistIcon,
       }),
     };
   },
@@ -383,13 +353,6 @@ export default {
       let userIsTaskUser = this.task.userId ? this.task.userId === this.user._id : true;
       return hasChecklist && userIsTaskUser;
     },
-    checklistProgress () {
-      const totalItems = this.task.checklist.length;
-      const completedItems = this.task.checklist.reduce((total, item) => {
-        return item.completed ? total + 1 : total;
-      }, 0);
-      return `${completedItems}/${totalItems}`;
-    },
     leftControl () {
       const task = this.task;
       if (task.type === 'reward') return false;
@@ -429,13 +392,10 @@ export default {
     },
   },
   methods: {
-    ...mapActions({
-      scoreChecklistItem: 'tasks:scoreChecklistItem',
-      collapseChecklist: 'tasks:collapseChecklist',
-    }),
+    ...mapActions({scoreChecklistItem: 'tasks:scoreChecklistItem'}),
     toggleChecklistItem (item) {
       if (this.castingSpell) return;
-      item.completed = !item.completed; // @TODO this should go into the action?
+      item.completed = !item.completed;
       this.scoreChecklistItem({taskId: this.task._id, itemId: item.id});
     },
     edit (e, task) {

website/client/components/tasks/taskModal.vue

@@ -110,22 +110,29 @@
               span.custom-control-indicator
               span.custom-control-description {{ $t('dayOfWeek') }}
 
-        .tags-select.option(v-if="isUserTask")
-          .tags-inline
-            label(v-once) {{ $t('tags') }}
-            .category-wrap(@click="showTagsSelect = !showTagsSelect", v-bind:class="{ active: showTagsSelect }")
-              span.category-select(v-if='task.tags && task.tags.length === 0')
-                .tags-none {{$t('none')}}
-                .dropdown-toggle
-              span.category-select(v-else)
-                .category-label(v-for='tagName in truncatedSelectedTags', :title="tagName") {{ tagName }}
-                .tags-more(v-if='remainingSelectedTags.length > 0') +{{ $t('more', { count: remainingSelectedTags.length }) }}
-                .dropdown-toggle
-          tags-popup(v-if="showTagsSelect", :tags="user.tags", v-model="task.tags")
+        .option(v-if="isUserTask")
+          label(v-once) {{ $t('tags') }}
+          .category-wrap(@click="showTagsSelect = !showTagsSelect")
+            span.category-select(v-if='task.tags && task.tags.length === 0') {{$t('none')}}
+            span.category-select(v-else)
+              .category-label(v-for='tagName in getTagsFor(task)') {{tagName}}
+          .category-box(v-if="showTagsSelect")
+            .container
+              .row
+                .form-check.col-6(
+                  v-for="tag in user.tags",
+                  :key="tag.id",
+                )
+                  label.custom-control.custom-checkbox
+                    input.custom-control-input(type="checkbox", :value="tag.id", v-model="task.tags")
+                    span.custom-control-indicator
+                    span.custom-control-description(v-once) {{ tag.name }}
+              .row
+                button.btn.btn-primary(@click="showTagsSelect = !showTagsSelect") {{$t('close')}}
 
         .option(v-if="task.type === 'habit'")
           label(v-once) {{ $t('resetStreak') }}
-          b-dropdown.streak-dropdown(:text="$t(task.frequency)")
+          b-dropdown(:text="$t(task.frequency)")
             b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}")
               | {{ $t(frequency) }}
 
@@ -321,88 +328,6 @@
       }
     }
 
-    .tags-select {
-      position: relative;
-
-      .tags-inline {
-        align-items: center;
-        display: flex;
-        justify-content: flex-start;
-
-        label {
-          margin: 0;
-        }
-
-        .category-wrap {
-          cursor: inherit;
-          position: relative;
-          border: 1px solid transparent;
-          border-radius: 2px;
-          margin-left: 4em;
-
-          &.active {
-            border-color: $purple-500;
-
-            .category-select {
-              box-shadow: none;
-            }
-          }
-
-          .category-select {
-            align-items: center;
-            display: flex;
-            padding: .6em;
-            padding-right: 2.8em;
-            width: 100%;
-
-            .tags-none {
-              margin: .26em 0 .26em .6em;
-
-              & + .dropdown-toggle {
-                right: 1.3em;
-              }
-            }
-
-            .tags-more {
-              color: #a5a1ac;
-              flex: 0 1 auto;
-              font-size: 12px;
-              text-align: left;
-              position: relative;
-              left: .5em;
-              width: 100%;
-            }
-
-            .dropdown-toggle {
-              position: absolute;
-              right: 1em;
-              top: .8em;
-            }
-
-            .category-label {
-              min-width: 68px;
-              overflow: hidden;
-              padding: .5em 1em;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              width: 68px;
-              word-wrap: break-word;
-            }
-          }
-        }
-      }
-
-      .tags-popup {
-        position: absolute;
-        top: 3.5em;
-        left: 6.2em;
-      }
-    }
-
-    .streak-dropdown {
-      margin-left: .5em;
-    }
-
     .checklist-group {
       border-top: 1px solid $gray-500;
     }
@@ -493,7 +418,6 @@
 </style>
 
 <script>
-import TagsPopup from './tagsPopup';
 import bModal from 'bootstrap-vue/lib/components/modal';
 import { mapGetters, mapActions, mapState } from 'client/libs/store';
 import bDropdown from 'bootstrap-vue/lib/components/dropdown';
@@ -517,7 +441,6 @@ import goldIcon from 'assets/svg/gold.svg';
 
 export default {
   components: {
-    TagsPopup,
     bModal,
     bDropdown,
     bDropdownItem,
@@ -530,7 +453,6 @@ export default {
   props: ['task', 'purpose', 'challengeId', 'groupId'], // purpose is either create or edit, task is the task created or edited
   data () {
     return {
-      maxTags: 3,
       showTagsSelect: false,
       showAssignedSelect: false,
       newChecklistItem: null,
@@ -652,15 +574,6 @@ export default {
         }
       },
     },
-    selectedTags () {
-      return this.getTagsFor(this.task);
-    },
-    truncatedSelectedTags () {
-      return this.selectedTags.slice(0, this.maxTags);
-    },
-    remainingSelectedTags () {
-      return this.selectedTags.slice(this.maxTags);
-    },
   },
   methods: {
     ...mapActions({saveTask: 'tasks:save', destroyTask: 'tasks:destroy', createTask: 'tasks:create'}),

website/client/mixins/buy.js

@@ -1,25 +1,14 @@
 export default {
   methods: {
-    makeGenericPurchase (item, type = 'buyModal') {
+    makeGenericPurchase (item) {
       this.$store.dispatch('shops:genericPurchase', {
         pinType: item.pinType,
         type: item.purchaseType,
         key: item.key,
         currency: item.currency,
       });
-
-      if (item.purchaseType !== 'gear') {
-        this.$store.state.recentlyPurchased[item.key] = true;
-      }
-
-      this.$root.$emit('playSound', 'Reward');
-
-      if (type !== 'buyModal') {
-        this.$emit('buyPressed', this.item);
-        return;
-      }
-
       this.$root.$emit('buyModal::boughtItem', item);
+      this.$root.$emit('playSound', 'Reward');
     },
   },
 };

website/client/mixins/payments.js

@@ -3,7 +3,6 @@ import axios from 'axios';
 const STRIPE_PUB_KEY = process.env.STRIPE_PUB_KEY; // eslint-disable-line
 import subscriptionBlocks from '../../common/script/content/subscriptionBlocks';
 import { mapState } from 'client/libs/store';
-import encodeParams from 'client/libs/encodeParams';
 import notificationsMixin from 'client/mixins/notifications';
 
 export default {
@@ -171,41 +170,5 @@ export default {
 
       this.$root.$emit('show::modal', 'amazon-payment');
     },
-    async cancelSubscription (config) {
-      if (config && config.group && !confirm(this.$t('confirmCancelGroupPlan'))) return;
-      if (!confirm(this.$t('sureCancelSub'))) return;
-
-      let group;
-      if (config && config.group) {
-        group = config.group;
-      }
-
-      let paymentMethod = this.user.purchased.plan.paymentMethod;
-      if (group) {
-        paymentMethod = group.purchased.plan.paymentMethod;
-      }
-
-      if (paymentMethod === 'Amazon Payments') {
-        paymentMethod = 'amazon';
-      } else {
-        paymentMethod = paymentMethod.toLowerCase();
-      }
-
-      let queryParams = {
-        _id: this.user._id,
-        apiToken: this.credentials.API_TOKEN,
-        noRedirect: true,
-      };
-
-      if (group) {
-        queryParams.groupId = group._id;
-      }
-
-      let cancelUrl = `/${paymentMethod}/subscribe/cancel?${encodeParams(queryParams)}`;
-      await axios.get(cancelUrl);
-      //  Success
-      alert(this.$t('paypalCanceled'));
-      this.$router.push('/');
-    },
   },
 };

website/client/router.js

@@ -73,7 +73,6 @@ const GroupPlansAppPage = () => import(/* webpackChunkName: "guilds" */ './compo
 // Group Plans
 const GroupPlanIndex = () => import(/* webpackChunkName: "group-plans" */ './components/group-plans/index');
 const GroupPlanTaskInformation = () => import(/* webpackChunkName: "group-plans" */ './components/group-plans/taskInformation');
-const GroupPlanBilling = () => import(/* webpackChunkName: "group-plans" */ './components/group-plans/billing');
 
 // Challenges
 const ChallengeIndex = () => import(/* webpackChunkName: "challenges" */ './components/challenges/index');
@@ -146,12 +145,6 @@ const router = new VueRouter({
           component: GroupPage,
           props: true,
         },
-        {
-          name: 'groupPlanBilling',
-          path: '/group-plans/:groupId/billing',
-          component: GroupPlanBilling,
-          props: true,
-        },
       ],
     },
     {

website/client/store/actions/tasks.js

@@ -124,13 +124,6 @@ export async function scoreChecklistItem (store, {taskId, itemId}) {
   await axios.post(`/api/v3/tasks/${taskId}/checklist/${itemId}/score`);
 }
 
-export async function collapseChecklist (store, task) {
-  task.collapseChecklist = !task.collapseChecklist;
-  await axios.put(`/api/v3/tasks/${task._id}`, {
-    collapseChecklist: task.collapseChecklist,
-  });
-}
-
 export async function destroy (store, task) {
   const list = store.state.tasks.data[`${task.type}s`];
   const taskIndex = list.findIndex(t => t._id === task._id);

website/client/store/index.js

@@ -135,8 +135,6 @@ export default function () {
       userIdToMessage: '',
       brokenChallengeTask: {},
       equipmentDrawerOpen: true,
-      recentlyPurchased: {},
-      groupPlans: [],
     },
   });
 

website/common/locales/en/front.json

@@ -312,6 +312,5 @@
   "signup": "Sign Up",
   "getStarted": "Get Started",
   "mobileApps": "Mobile Apps",
-  "learnMore": "Learn More",
-  "useMobileApps": "Habitica is not optimized for a mobile browser. We recommend downloading our mobile apps."
+  "learnMore": "Learn More"
 }

website/common/locales/en/generic.json

@@ -68,7 +68,6 @@
   "subscriberItemText": "Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month. See the wiki's 'Mystery Item' page for more information.",
   "all": "All",
   "none": "None",
-  "more": "<%= count %> more",
   "and": "and",
   "loginSuccess": "Login successful!",
   "youSure": "Are you sure?",

website/common/locales/en/groups.json

@@ -393,8 +393,5 @@
   "details": "Details",
   "participantDesc": "Once all members have either accepted or declined, the Quest begins. Only those who clicked 'accept' will be able to participate in the Quest and receive the rewards.",
   "groupGems": "Group Gems",
-  "groupGemsDesc": "Guild Gems can be spent to make Challenges! In the future, you will be able to add more Guild Gems.",
-  "groupTaskBoard": "Task Board",
-  "groupInformation": "Group Information",
-  "groupBilling": "Group Billing"
+  "groupGemsDesc": "Guild Gems can be spent to make Challenges! In the future, you will be able to add more Guild Gems."
 }

website/common/locales/en/subscriber.json

@@ -202,7 +202,5 @@
     "haveCouponCode": "Do you have a coupon code?",
     "subscriptionAlreadySubscribedLeadIn": "Thanks for subscribing!",
     "subscriptionAlreadySubscribed1": "To see your subscription details and cancel, renew, or change your subscription, please go to <a href='/user/settings/subscription'>User icon &gt; Settings &gt; Subscription</a>.",
-    "purchaseAll": "Purchase All",
-    "gemsPurchaseNote": "Subscribers can buy gems for gold in the Market! For easy access, you can also pin the gem to your Rewards column.",
-    "gemsRemaining": "gems remaining"
+    "purchaseAll": "Purchase All"
 }

website/common/script/ops/pinnedGearUtils.js

@@ -179,6 +179,5 @@ module.exports = {
   removePinnedItemsByOwnedGear,
   togglePinnedItem,
   removeItemByPath,
-  selectGearToPin,
   isPinned,
 };