Merge branch 'release' into develop

2026-07-17 03:22:14 +00:00 · 2021-11-01 14:08:52 -05:00 · 2021-11-01 14:08:52 -05:00 · 7afbe39ae9
commit 7afbe39ae9
parent 613b027d08 ec1f4f200b
9 changed files with 95 additions and 96 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.210.1",
+  "version": "4.210.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -3340,11 +3340,6 @@
        "node-releases": "^1.1.71"
      },
      "dependencies": {
-        "caniuse-lite": {
-          "version": "1.0.30001228",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
-          "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A=="
-        },
        "colorette": {
          "version": "1.2.2",
          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
@ -3514,9 +3509,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30001270",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz",
-      "integrity": "sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A=="
+      "version": "1.0.30001272",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001272.tgz",
+      "integrity": "sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw=="
    },
    "caseless": {
      "version": "0.12.0",
--- 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.210.1",
+  "version": "4.210.2",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.15.8",
--- a/test/common/ops/buy/purchase.js
+++ b/test/common/ops/buy/purchase.js
@ -13,7 +13,7 @@ import {
 } from '../../../helpers/common.helper';

 describe('shared.ops.purchase', () => {
-  const SEASONAL_FOOD = 'Candy_Base';
+  const SEASONAL_FOOD = moment().isBefore('2021-11-02T20:00-04:00') ? 'Candy_Base' : 'Meat';
  let user;
  const goldPoints = 40;
  const analytics = { track () {} };
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@ -12849,31 +12849,11 @@
          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
        "is-fullwidth-code-point": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
        "minimist": {
          "version": "1.2.5",
          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
@ -12910,35 +12890,6 @@
            "ansi-regex": "^5.0.1"
          }
        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.1",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
-          "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            }
-          }
-        },
        "wrap-ansi": {
          "version": "6.2.0",
          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@ -28906,6 +28857,85 @@
        }
      }
    },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.2.tgz",
+      "integrity": "sha512-Nkq+z9mAsMEK+qkXgK+9Ia7D8w9uu9j4ut0IMT5coMfux3rCgIp1QBB1CYwY0M34A1nRMSONEaWXxAAw6xSl/Q==",
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "optional": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.1.tgz",
+          "integrity": "sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ==",
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
    "vue-mugen-scroll": {
      "version": "0.2.6",
      "resolved": "https://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.6.tgz",
--- a/website/client/src/components/auth/registerLoginReset.vue
+++ b/website/client/src/components/auth/registerLoginReset.vue
@ -1,21 +1,5 @@
 <template>
  <div class="form-wrapper">
-    <div
-      v-if="forgotPassword && preOutage"
-      class="warning-banner d-flex"
-    >
-      <div class="warning-box ml-auto my-auto mr-2 d-flex">
-        <div
-          class="svg-icon exclamation m-auto"
-          v-html="icons.exclamation"
-        >
-        </div>
-      </div>
-      <div class="mr-auto my-auto">
-        Habitica emails will be temporarily unavailable on <strong>January 11, 2020</strong> from
-        <strong>1:00 - 7:00 AM EST</strong>.
-      </div>
-    </div>
    <div id="top-background">
      <div class="seamless_stars_varied_opacity_repeat"></div>
    </div>
@ -35,7 +19,10 @@
          ></div>
        </div>
      </div>
-      <div class="form-group row text-center">
+      <div
+        class="form-group row text-center"
+        v-if="!registering"
+      >
        <div class="col-12 col-md-12">
          <div
            class="btn btn-secondary social-button"
@ -48,9 +35,7 @@
            <div
              class="text"
            >
-              {{ registering
-                ? $t('signUpWithSocial', {social: 'Facebook'})
-                : $t('loginWithSocial', {social: 'Facebook'}) }}
+              {{ $t('loginWithSocial', {social: 'Facebook'}) }}
            </div>
          </div>
        </div>
@ -648,7 +633,6 @@
 <script>
 import axios from 'axios';
 import hello from 'hellojs';
-import moment from 'moment';
 import debounce from 'lodash/debounce';
 import isEmail from 'validator/lib/isEmail';
 import { buildAppleAuthUrl } from '../../libs/auth';
@ -738,9 +722,6 @@ export default {
        || this.passwordInvalid
        || this.passwordConfirmInvalid;
    },
-    preOutage () {
-      return moment.utc().isBefore('2020-01-12');
-    },
  },
  watch: {
    $route: {
--- a/website/client/src/components/static/home.vue
+++ b/website/client/src/components/static/home.vue
@ -106,16 +106,6 @@
              <span>{{ $t('or') }}</span>
            </div>
            <div class="text-center">
-              <button
-                class="social-button"
-                @click="socialAuth('facebook')"
-              >
-                <div
-                  class="svg-icon social-icon"
-                  v-html="icons.facebookIcon"
-                ></div>
-                <span>{{ $t('signUpWithSocial', {social: 'Facebook'}) }}</span>
-              </button>
              <button
                class="social-button"
                @click="socialAuth('google')"
--- a/website/client/src/mixins/reportBug.js
+++ b/website/client/src/mixins/reportBug.js
@ -5,6 +5,9 @@ export default {
    ...mapState({ user: 'user.data' }),
    bugReportMailto () {
      let subscriptionInfo = 'Not Subscribed';
+      if (!this.user) {
+        return 'mailto:admin@habitica.com?subject=Habitica Web Bug Report';
+      }
      if (this.user.purchased.plan.customerId) {
        subscriptionInfo = `
          Subscription: ${this.user.purchased.plan.planId}%0d%0a
--- a/website/client/src/mixins/scoreTask.js
+++ b/website/client/src/mixins/scoreTask.js
@ -76,7 +76,7 @@ export default {
      if (!tasksScoredCount || tasksScoredCount < 2) {
        Analytics.track({
          eventName: 'task scored',
-          eventAction: 'click',
+          eventAction: 'task scored',
          eventCategory: 'behavior',
          hitType: 'event',
          uuid: user._id,
--- a/website/client/src/store/actions/tasks.js
+++ b/website/client/src/store/actions/tasks.js
@ -115,7 +115,7 @@ export async function create (store, createdTask) {
      const uuid = store.state.user.data._id;
      Analytics.track({
        eventName: 'task created',
-        eventAction: 'click',
+        eventAction: 'task created',
        eventCategory: 'behavior',
        hitType: 'event',
        uuid,