Disable Amplitude on client for dev environment

.eslintrc.js

@@ -5,7 +5,6 @@ module.exports = {
     'habitrpg/lib/node',
   ],
   rules: {
-    'prefer-regex-literals': 'warn',
     'import/no-extraneous-dependencies': 'off',
   },
 };

.github/dependabot.yml

@@ -0,0 +1,150 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "06:00"
+    timezone: Europe/Rome
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: express-validator
+    versions:
+    - 6.10.0
+    - 6.10.1
+    - 6.9.2
+  - dependency-name: "@babel/core"
+    versions:
+    - 7.12.13
+    - 7.12.16
+    - 7.12.17
+    - 7.13.1
+    - 7.13.10
+    - 7.13.13
+    - 7.13.14
+    - 7.13.15
+    - 7.13.8
+  - dependency-name: redis
+    versions:
+    - 3.1.0
+  - dependency-name: stripe
+    versions:
+    - 8.134.0
+    - 8.135.0
+    - 8.137.0
+    - 8.138.0
+    - 8.140.0
+    - 8.142.0
+  - dependency-name: "@babel/register"
+    versions:
+    - 7.12.13
+    - 7.13.14
+    - 7.13.8
+  - dependency-name: mongoose
+    versions:
+    - 5.11.14
+    - 5.11.15
+    - 5.11.16
+    - 5.11.17
+    - 5.11.18
+    - 5.11.19
+    - 5.12.0
+    - 5.12.1
+    - 5.12.2
+    - 5.12.3
+  - dependency-name: jwks-rsa
+    versions:
+    - 1.12.3
+    - 2.0.1
+    - 2.0.2
+  - dependency-name: "@babel/preset-env"
+    versions:
+    - 7.12.13
+    - 7.12.16
+    - 7.12.17
+    - 7.13.10
+    - 7.13.12
+    - 7.13.8
+    - 7.13.9
+  - dependency-name: image-size
+    versions:
+    - 0.9.4
+    - 0.9.5
+    - 0.9.7
+  - dependency-name: winston-loggly-bulk
+    versions:
+    - 3.2.0
+  - dependency-name: chai
+    versions:
+    - 4.3.0
+    - 4.3.3
+  - dependency-name: mocha
+    versions:
+    - 8.2.1
+    - 8.3.0
+    - 8.3.1
+  - dependency-name: "@google-cloud/trace-agent"
+    versions:
+    - 5.1.2
+  - dependency-name: monk
+    versions:
+    - 7.3.3
+- package-ecosystem: npm
+  directory: "/website/client"
+  schedule:
+    interval: weekly
+    time: "06:00"
+    timezone: Europe/Rome
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: eslint-plugin-vue
+    versions:
+    - 7.5.0
+    - 7.6.0
+    - 7.7.0
+    - 7.8.0
+    - 7.9.0
+  - dependency-name: core-js
+    versions:
+    - 3.10.0
+    - 3.10.1
+    - 3.9.0
+    - 3.9.1
+  - dependency-name: bootstrap
+    versions:
+    - 4.6.0
+  - dependency-name: y18n
+    versions:
+    - 4.0.1
+  - dependency-name: hellojs
+    versions:
+    - 1.18.8
+    - 1.19.2
+  - dependency-name: chai
+    versions:
+    - 4.3.0
+    - 4.3.3
+  - dependency-name: amplitude-js
+    versions:
+    - 7.4.2
+    - 7.4.3
+    - 7.4.4
+  - dependency-name: pug
+    versions:
+    - 3.0.2
+  - dependency-name: sass
+    versions:
+    - 1.32.6
+    - 1.32.7
+    - 1.32.8
+  - dependency-name: "@vue/test-utils"
+    versions:
+    - 1.1.2
+    - 1.1.3
+  - dependency-name: intro.js
+    versions:
+    - 3.2.1
+    - 3.3.1
+  - dependency-name: sass-loader
+    versions:
+    - 10.1.1

.github/workflows/test.yml

@@ -10,20 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -32,20 +31,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -54,20 +52,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -77,20 +74,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -99,20 +95,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -122,14 +117,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
         mongodb-version: [4.2]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
@@ -137,11 +132,10 @@ jobs:
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
         mongodb-replica-set: rs
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -152,14 +146,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
         mongodb-version: [4.2]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
@@ -167,11 +161,10 @@ jobs:
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
         mongodb-replica-set: rs
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -182,14 +175,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
         mongodb-version: [4.2]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
@@ -197,11 +190,10 @@ jobs:
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
         mongodb-replica-set: rs
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -213,20 +205,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -237,16 +228,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt-get -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |

.gitignore

@@ -40,7 +40,6 @@ yarn.lock
 !.elasticbeanstalk/*.global.yml
 
 /.vscode
-habitica.code-workspace
 
 # webstorm fake webpack for path intellisense
 webpack.webstorm.config

.nvmrc

@@ -1 +1 @@
-20
+14

Dockerfile

@@ -0,0 +1,30 @@
+FROM node:14
+
+ENV ADMIN_EMAIL admin@habitica.com
+ENV EMAILS_COMMUNITY_MANAGER_EMAIL admin@habitica.com
+ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e
+ENV AMAZON_PAYMENTS_SELLER_ID AMQ3SB4SG5E91
+ENV AMPLITUDE_KEY e8d4c24b3d6ef3ee73eeba715023dd43
+ENV BASE_URL https://habitica.com
+ENV FACEBOOK_KEY 128307497299777
+ENV GA_ID UA-33510635-1
+ENV GOOGLE_CLIENT_ID 1035232791481-32vtplgnjnd1aufv3mcu1lthf31795fq.apps.googleusercontent.com
+ENV LOGGLY_CLIENT_TOKEN ab5663bf-241f-4d14-8783-7d80db77089a
+ENV NODE_ENV production
+ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA
+ENV APPLE_AUTH_CLIENT_ID 9Q9SMRMCNN.com.habitrpg.ios.Habitica
+
+# Install global packages
+RUN npm install -g gulp-cli mocha
+
+# Clone Habitica repo and install dependencies
+RUN mkdir -p /usr/src/habitrpg
+WORKDIR /usr/src/habitrpg
+RUN git clone --branch release --depth 1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN git config --global url."https://".insteadOf git://
+RUN npm set unsafe-perm true
+RUN npm install
+
+# Start Habitica
+EXPOSE 80 8080 36612
+CMD ["node", "./website/transpiled-babel/index.js"]

Dockerfile-Dev

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:14
 
 # Install global packages
 RUN npm install -g gulp-cli mocha

README.md

@@ -1,7 +1,7 @@
 Habitica ![Build Status](https://github.com/HabitRPG/habitica/workflows/Test/badge.svg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 ===============
 
-[Habitica](https://habitica.com) is an open-source habit-building program that treats your life like a role-playing game. Level up as you succeed, lose HP as you fail, and earn money to buy weapons and armor.
+[Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
 
 **We need more programmers!** Your assistance will be greatly appreciated. The wiki pages below and the additional pages they link to will tell you how to get started on contributing code and where you can go to seek further help or ask questions:
 * [Guidance for Blacksmiths](https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths) - an introduction to the technologies used and how the software is organized.

config.json.example

@@ -87,5 +87,5 @@
   "REDIS_HOST": "aaabbbcccdddeeefff",
   "REDIS_PORT": "1234",
   "REDIS_PASSWORD": "12345678",
-  "TRUSTED_DOMAINS": "localhost,https://habitica.com"
+  "TRUSTED_DOMAINS": "localhost,habitica.com"
 }

migrations/archive/2021/20210129_habit_birthday.js

@@ -61,7 +61,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: {$ne: MIGRATION_NAME},
+    // migration: {$ne: MIGRATION_NAME},
     'auth.timestamps.loggedin': {$gt: new Date('2021-01-01')},
   };
 

migrations/archive/2021/20210824_pet_group_achievements.js

@@ -105,7 +105,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2021-08-01') },
   };
 

migrations/archive/2022/20220201_pet_group_achievements.js

@@ -145,7 +145,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2021-08-01') },
   };
 

migrations/archive/2022/20220309_pet_group_achievements.js

@@ -105,7 +105,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2021-08-01') },
   };
 

migrations/archive/2022/20220524_pet_group_achievements.js

@@ -95,7 +95,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
   };
 

migrations/archive/2022/20221031_pet_set_group_achievements.js

@@ -86,7 +86,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
   };
 

migrations/archive/2022/20221213_pet_group_achievements.js

@@ -63,7 +63,7 @@ async function updateUser (user) {
       && pets['Wolf-Shade']
       && pets['Wolf-Skeleton']
       && pets['Wolf-White']
-      && pets['Wolf-Zombie']) {
+      && pets['Wolf-Zombie'] {
         set['achievements.polarPro'] = true;
       }
   }
@@ -75,7 +75,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2022-11-01') },
   };
 

migrations/archive/2023/20230522_pet_group_achievements.js

@@ -125,7 +125,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2023-04-15') },
   };
 

migrations/archive/2023/20230808_veteran_pet_ladder.js

@@ -110,7 +110,7 @@ async function updateUser (user) {
 export default async function processUsers () {
   let query = {
     migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': { $gt: new Date('2023-07-08') },
+    // 'auth.timestamps.loggedin': { $gt: new Date('2023-07-08') },
   };
 
   const fields = {

migrations/archive/2024/20240318_pet_group_achievements.js

@@ -1,89 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '202403_pet_group_achievements';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  let set = {
-    migration: MIGRATION_NAME,
-  };
-
-  if (user && user.items && user.items.pets) {
-    const pets = user.items.pets;
-    if (pets['GuineaPig-Zombie'] > 0
-      && pets['GuineaPig-Skeleton'] > 0
-      && pets['GuineaPig-Base'] > 0
-      && pets['GuineaPig-Desert'] > 0
-      && pets['GuineaPig-Red'] > 0
-      && pets['GuineaPig-Shade'] > 0
-      && pets['GuineaPig-White']> 0
-      && pets['GuineaPig-Golden'] > 0
-      && pets['GuineaPig-CottonCandyBlue'] > 0
-      && pets['GuineaPig-CottonCandyPink'] > 0
-      && pets['Squirrel-Zombie'] > 0
-      && pets['Squirrel-Skeleton'] > 0
-      && pets['Squirrel-Base'] > 0
-      && pets['Squirrel-Desert'] > 0
-      && pets['Squirrel-Red'] > 0
-      && pets['Squirrel-Shade'] > 0
-      && pets['Squirrel-White'] > 0
-      && pets['Squirrel-Golden'] > 0
-      && pets['Squirrel-CottonCandyBlue'] > 0
-      && pets['Squirrel-CottonCandyPink'] > 0
-      && pets['Rat-Zombie'] > 0
-      && pets['Rat-Skeleton'] > 0
-      && pets['Rat-Base'] > 0
-      && pets['Rat-Desert'] > 0
-      && pets['Rat-Red'] > 0
-      && pets['Rat-Shade'] > 0
-      && pets['Rat-White'] > 0
-      && pets['Rat-Golden'] > 0
-      && pets['Rat-CottonCandyBlue'] > 0
-      && pets['Rat-CottonCandyPink'] > 0 ) {
-        set['achievements.rodentRuler'] = true;
-      
-    }
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.updateOne({ _id: user._id }, { $set: set }).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-02-01') },
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1]._id,
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2024/20240516_pet_group_achievements.js

@@ -1,99 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '202405_pet_group_achievements';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  let set = {
-    migration: MIGRATION_NAME,
-  };
-
-  if (user && user.items && user.items.pets) {
-    const pets = user.items.pets;
-    if (pets['LionCub-Zombie'] > 0
-      && pets['LionCub-Skeleton'] > 0
-      && pets['LionCub-Base'] > 0
-      && pets['LionCub-Desert'] > 0
-      && pets['LionCub-Red'] > 0
-      && pets['LionCub-Shade'] > 0
-      && pets['LionCub-White']> 0
-      && pets['LionCub-Golden'] > 0
-      && pets['LionCub-CottonCandyBlue'] > 0
-      && pets['LionCub-CottonCandyPink'] > 0
-      && pets['TigerCub-Zombie'] > 0
-      && pets['TigerCub-Skeleton'] > 0
-      && pets['TigerCub-Base'] > 0
-      && pets['TigerCub-Desert'] > 0
-      && pets['TigerCub-Red'] > 0
-      && pets['TigerCub-Shade'] > 0
-      && pets['TigerCub-White'] > 0
-      && pets['TigerCub-Golden'] > 0
-      && pets['TigerCub-CottonCandyBlue'] > 0
-      && pets['TigerCub-CottonCandyPink'] > 0
-      && pets['Sabretooth-Zombie'] > 0
-      && pets['Sabretooth-Skeleton'] > 0
-      && pets['Sabretooth-Base'] > 0
-      && pets['Sabretooth-Desert'] > 0
-      && pets['Sabretooth-Red'] > 0
-      && pets['Sabretooth-Shade'] > 0
-      && pets['Sabretooth-White'] > 0
-      && pets['Sabretooth-Golden'] > 0
-      && pets['Sabretooth-CottonCandyBlue'] > 0
-      && pets['Sabretooth-CottonCandyPink'] > 0 
-      && pets['Cheetah-Zombie'] > 0
-      && pets['Cheetah-Skeleton'] > 0
-      && pets['Cheetah-Base'] > 0
-      && pets['Cheetah-Desert'] > 0
-      && pets['Cheetah-Red'] > 0
-      && pets['Cheetah-Shade'] > 0
-      && pets['Cheetah-White'] > 0
-      && pets['Cheetah-Golden'] > 0
-      && pets['Cheetah-CottonCandyBlue'] > 0
-      && pets['Cheetah-CottonCandyPink'] > 0 ) {
-        set['achievements.cats'] = true;
-      
-    }
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.updateOne({ _id: user._id }, { $set: set }).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-03-01') },
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-  };
-
-  while (true) { // eslint-disable-line no-constant-condition
-    const users = await User // eslint-disable-line no-await-in-loop
-      .find(query)
-      .limit(250)
-      .sort({_id: 1})
-      .select(fields)
-      .lean()
-      .exec();
-
-    if (users.length === 0) {
-      console.warn('All appropriate users found and modified.');
-      console.warn(`\n${count} users processed\n`);
-      break;
-    } else {
-      query._id = {
-        $gt: users[users.length - 1]._id,
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/takeThis.js

@@ -0,0 +1,118 @@
+let migrationName = '20180904_takeThis.js'; // Update per month
+let authorName = 'Sabe'; // in case script author needs to know when their ...
+let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
+
+/*
+ * Award Take This ladder items to participants in this month's challenge
+ */
+
+import monk from 'monk';
+import nconf from 'nconf';
+const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING'); // FOR TEST DATABASE
+let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });
+
+function processUsers (lastId) {
+  // specify a query to limit the affected users (empty for all users):
+  let query = {
+    migration: {$ne: migrationName},
+    challenges: {$in: ['1044ec0c-4a85-48c5-9f36-d51c0c62c7d3']}, // Update per month
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  dbUsers.find(query, {
+    sort: {_id: 1},
+    limit: 250,
+    fields: [
+      'items.gear.owned',
+    ], // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+  })
+    .then(updateUsers)
+    .catch((err) => {
+      console.log(err);
+      return exiting(1, `ERROR! ${  err}`);
+    });
+}
+
+let progressCount = 1000;
+let count = 0;
+
+function updateUsers (users) {
+  if (!users || users.length === 0) {
+    console.warn('All appropriate users found and modified.');
+    displayData();
+    return;
+  }
+
+  let userPromises = users.map(updateUser);
+  let lastUser = users[users.length - 1];
+
+  return Promise.all(userPromises)
+    .then(() => {
+      processUsers(lastUser._id);
+    });
+}
+
+function updateUser (user) {
+  count++;
+
+  let set = {};
+  let push;
+
+  if (typeof user.items.gear.owned.back_special_takeThis !== 'undefined') {
+    set = {migration: migrationName};
+  } else if (typeof user.items.gear.owned.body_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.back_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.back_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.head_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.body_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.body_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.head_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.head_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.armor_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.weapon_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.weapon_special_takeThis', _id: monk.id()}};
+  } else {
+    set = {migration: migrationName, 'items.gear.owned.shield_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.shield_special_takeThis', _id: monk.id()}};
+  }
+
+  if (push) {
+    dbUsers.update({_id: user._id}, {$set: set, $push: push});
+  } else {
+    dbUsers.update({_id: user._id}, {$set: set});
+  }
+
+  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
+  if (user._id === authorUuid) console.warn(`${authorName  } processed`);
+}
+
+function displayData () {
+  console.warn(`\n${  count  } users processed\n`);
+  return exiting(0);
+}
+
+function exiting (code, msg) {
+  code = code || 0; // 0 = success
+  if (code && !msg) {
+    msg = 'ERROR!';
+  }
+  if (msg) {
+    if (code) {
+      console.error(msg);
+    } else      {
+      console.log(msg);
+    }
+  }
+  process.exit(code);
+}
+
+module.exports = processUsers;

migrations/csvexport.py

@@ -0,0 +1,10 @@
+import csv
+
+with open(r"/home/slappybag/Documents/SurveyScrape.csv") as f:
+     reader = csv.reader(f, delimiter=',', quotechar='"')
+     column = []
+     for row in reader:
+        if row:
+            column.append(row[4])
+
+print column

migrations/users/full-stable.js

@@ -51,7 +51,7 @@ async function updateUser (user) {
 
   if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
 
-  return User.updateOne({ _id: user._id }, { $set: set }).exec();
+  return User.update({ _id: user._id }, { $set: set }).exec();
 }
 
 export default async function processUsers () {

migrations/users/pi-day.js

@@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid';
 
 import { model as User } from '../../website/server/models/user';
 
-const MIGRATION_NAME = '20240314_pi_day';
+const MIGRATION_NAME = '20230314_pi_day';
 
 const progressCount = 1000;
 let count = 0;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.24.3",
+  "version": "5.16.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.10",
@@ -27,7 +27,7 @@
     "eslint": "^8.55.0",
     "eslint-config-habitrpg": "^6.2.3",
     "eslint-plugin-mocha": "^5.0.0",
-    "express": "^4.19.2",
+    "express": "^4.18.2",
     "express-basic-auth": "^1.2.1",
     "express-validator": "^5.2.0",
     "glob": "^8.1.0",
@@ -78,8 +78,8 @@
   },
   "private": true,
   "engines": {
-    "node": "20",
-    "npm": "^10"
+    "node": "^14",
+    "npm": "^6"
   },
   "scripts": {
     "lint": "eslint --ext .js --fix . && cd website/client && npm run lint",
@@ -123,5 +123,6 @@
     "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
-  }
+  },
+  "optionalDependencies": {}
 }

test/api/unit/libs/apiError.js

@@ -1,4 +1,4 @@
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('API Messages', () => {
   const message = 'Only public guilds support pagination.';

test/api/unit/libs/mongodb.js

@@ -44,7 +44,7 @@ describe('mongodb', () => {
       const mongoLibOverride = requireAgain(pathToMongoLib);
 
       const options = mongoLibOverride.getDefaultConnectionOptions();
-      expect(options).to.have.all.keys(['useNewUrlParser', 'useUnifiedTopology']);
+      expect(options).to.have.all.keys(['useNewUrlParser', 'useUnifiedTopology', 'keepAlive', 'keepAliveInitialDelay']);
     });
   });
 });

test/api/unit/libs/payments/amazon/checkout.test.js

@@ -2,7 +2,7 @@ import { model as User } from '../../../../../../website/server/models/user';
 import amzLib from '../../../../../../website/server/libs/payments/amazon';
 import payments from '../../../../../../website/server/libs/payments/payments';
 import common from '../../../../../../website/common';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import * as gems from '../../../../../../website/server/libs/payments/gems';
 
 const { i18n } = common;

test/api/unit/libs/payments/paypal/checkout.test.js

@@ -4,7 +4,7 @@ import nconf from 'nconf';
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
 import { model as User } from '../../../../../../website/server/models/user';
 import common from '../../../../../../website/common';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import * as gems from '../../../../../../website/server/libs/payments/gems';
 
 const BASE_URL = nconf.get('BASE_URL');

test/api/unit/libs/payments/stripe/oneTimePayments.test.js

@@ -1,4 +1,4 @@
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import common from '../../../../../../website/common';
 import {
   getOneTimePaymentInfo,

test/api/unit/middlewares/ensureAccessRight.test.js

@@ -6,7 +6,7 @@ import {
 } from '../../../helpers/api-unit.helper';
 import { ensurePermission } from '../../../../website/server/middlewares/ensureAccessRight';
 import { NotAuthorized } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('ensure access middlewares', () => {
   let res; let req; let

test/api/unit/middlewares/ipBlocker.test.js

@@ -6,7 +6,7 @@ import {
   generateNext,
 } from '../../../helpers/api-unit.helper';
 import { Forbidden } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 function checkErrorThrown (next) {
   expect(next).to.have.been.calledOnce;

test/api/unit/middlewares/rateLimiter.test.js

@@ -7,7 +7,7 @@ import {
   generateNext,
 } from '../../../helpers/api-unit.helper';
 import { TooManyRequests } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 import logger from '../../../../website/server/libs/logger';
 
 describe('rateLimiter middleware', () => {

test/api/unit/models/webhook.test.js

@@ -1,7 +1,7 @@
 import { v4 as generateUUID } from 'uuid';
 import { model as Webhook } from '../../../../website/server/models/webhook';
 import { BadRequest } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('Webhook Model', () => {
   context('Instance Methods', () => {

test/api/v3/integration/challenges/POST-challenge_flag.test.js

@@ -7,7 +7,6 @@ import {
 
 describe('POST /challenges/:challengeId/flag', () => {
   let user;
-  let challengeGroup;
   let challenge;
 
   beforeEach(async () => {
@@ -21,7 +20,6 @@ describe('POST /challenges/:challengeId/flag', () => {
     });
 
     user = groupLeader;
-    challengeGroup = group;
 
     challenge = await generateChallenge(user, group);
   });
@@ -61,19 +59,4 @@ describe('POST /challenges/:challengeId/flag', () => {
         message: t('messageChallengeFlagAlreadyReported'),
       });
   });
-
-  it('returns an error when user tries to flag an official challenge', async () => {
-    await user.updateOne({
-      permissions: {
-        challengeAdmin: true,
-      },
-    });
-    challenge = await generateChallenge(user, challengeGroup, { official: true });
-    await expect(user.post(`/challenges/${challenge._id}/flag`))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('messageChallengeFlagOfficial'),
-      });
-  });
 });

test/api/v3/integration/challenges/POST-challenges.test.js

@@ -331,71 +331,5 @@ describe('POST /challenges', () => {
 
       expect(updatedChallenge.summary).to.eql(summary);
     });
-
-    it('sets categories for challenges', async () => {
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'test', name: 'Test' };
-      const challenge = await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      });
-
-      const updatedChallenge = await groupLeader.get(`/challenges/${challenge._id}`);
-
-      expect(updatedChallenge.categories).to.eql([testCategory]);
-    });
-
-    it('does not set habitica_official category for non-admins', async () => {
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'habitica_official', name: 'habitica_official' };
-      await expect(groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('noPrivAccess'),
-      });
-    });
-
-    it('sets habitica_official category for admins', async () => {
-      await groupLeader.updateOne({
-        permissions: {
-          challengeAdmin: true,
-        },
-      });
-
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'habitica_official', name: 'habitica_official' };
-      const challenge = await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      });
-
-      const updatedChallenge = await groupLeader.get(`/challenges/${challenge._id}`);
-      expect(updatedChallenge.categories).to.eql([testCategory]);
-    });
-
-    it('sets official if the habitica_official category is set for admins', async () => {
-      await groupLeader.updateOne({
-        permissions: {
-          challengeAdmin: true,
-        },
-      });
-
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'habitica_official', name: 'habitica_official' };
-      const challenge = await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      });
-
-      const updatedChallenge = await groupLeader.get(`/challenges/${challenge._id}`);
-      expect(updatedChallenge.official).to.eql(true);
-    });
   });
 });

test/api/v3/integration/chat/POST-chat.like.test.js

@@ -39,21 +39,19 @@ describe('POST /chat/:chatId/like', () => {
       });
   });
 
-  it('Likes a chat', async () => {
-    const message = await anotherUser.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
+  it('Returns an error when user tries to like their own message', async () => {
+    const message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
 
-    const likeResult = await user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`);
-
-    expect(likeResult.likes[user._id]).to.equal(true);
-
-    const groupWithChatLikes = await user.get(`/groups/${groupWithChat._id}`);
-
-    const messageToCheck = find(groupWithChatLikes.chat, { id: message.message.id });
-    expect(messageToCheck.likes[user._id]).to.equal(true);
+    await expect(user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('messageGroupChatLikeOwnMessage'),
+      });
   });
 
-  it('Allows to likes their own chat message', async () => {
-    const message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
+  it('Likes a chat', async () => {
+    const message = await anotherUser.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
 
     const likeResult = await user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`);
 

test/api/v3/integration/coupons/GET-coupons.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   resetHabiticaDB,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('GET /coupons/', () => {
   let user;

test/api/v3/integration/coupons/POST-coupons_generate_event.test.js

@@ -4,7 +4,7 @@ import {
   translate as t,
   resetHabiticaDB,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('POST /coupons/generate/:event', () => {
   let user;

test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js

@@ -9,7 +9,7 @@ describe('GET /heroes/:heroId', () => {
 
   const heroFields = [
     '_id', 'id', 'auth', 'balance', 'contributor', 'flags', 'items',
-    'lastCron', 'party', 'preferences', 'profile', 'purchased', 'secret', 'achievements',
+    'lastCron', 'party', 'preferences', 'profile', 'purchased', 'secret',
   ];
 
   before(async () => {

test/api/v3/integration/hall/GET-hall_heroes_party_groupId.test.js

@@ -4,7 +4,7 @@ import {
   generateGroup,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('GET /heroes/party/:groupId', () => {
   let user; // admin user

test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js

@@ -10,7 +10,7 @@ describe('PUT /heroes/:heroId', () => {
 
   const heroFields = [
     '_id', 'auth', 'balance', 'contributor', 'flags', 'items', 'lastCron',
-    'party', 'preferences', 'profile', 'purchased', 'secret', 'permissions', 'achievements',
+    'party', 'preferences', 'profile', 'purchased', 'secret', 'permissions',
   ];
 
   before(async () => {
@@ -251,159 +251,4 @@ describe('PUT /heroes/:heroId', () => {
     expect(updatedHero.apiToken).to.not.equal(originalToken);
     expect(updatedHero.apiTokenObscured).to.not.exist;
   });
-
-  it('updates purchased hair customization', async () => {
-    const hero = await generateUser();
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      purchasedPath: 'purchased.hair.bangs.1',
-      purchasedVal: true,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.purchased.hair.bangs['1']).to.equal(true);
-    // test hero values
-    await hero.sync();
-    expect(hero.purchased.hair.bangs['1']).to.equal(true);
-  });
-
-  it('updates purchased customization', async () => {
-    const hero = await generateUser();
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      purchasedPath: 'purchased.background.beach',
-      purchasedVal: true,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.purchased.background.beach).to.equal(true);
-    // test hero values
-    await hero.sync();
-    expect(hero.purchased.background.beach).to.equal(true);
-  });
-
-  it('updates giving nested achievement', async () => {
-    const hero = await generateUser();
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      achievementPath: 'achievements.quests.dilatory',
-      achievementVal: 2,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.achievements.quests.dilatory).to.equal(2);
-    // test hero values
-    await hero.sync();
-    expect(hero.achievements.quests.dilatory).to.equal(2);
-  });
-
-  it('updates taking away nested achievement', async () => {
-    const hero = await generateUser({ 'achievements.quests.dilatory': 3 });
-    expect(hero.achievements.quests.dilatory).to.equal(3);
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      achievementPath: 'achievements.quests.dilatory',
-      achievementVal: 0,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.achievements.quests.dilatory).to.equal(0);
-    // test hero values
-    await hero.sync();
-    expect(hero.achievements.quests.dilatory).to.equal(0);
-  });
-
-  it('updates giving achievement', async () => {
-    const hero = await generateUser();
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      achievementPath: 'achievements.partyOn',
-      achievementVal: true,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.achievements.partyOn).to.equal(true);
-    // test hero values
-    await hero.sync();
-    expect(hero.achievements.partyOn).to.equal(true);
-  });
-
-  it('updates taking away achievement', async () => {
-    const hero = await generateUser({ 'achievements.partyUp': true });
-    expect(hero.achievements.partyUp).to.equal(true);
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      achievementPath: 'achievements.partyUp',
-      achievementVal: false,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.achievements.partyUp).to.equal(false);
-    // test hero values
-    await hero.sync();
-    expect(hero.achievements.partyUp).to.equal(false);
-  });
-
-  it('updates giving numbered achievement', async () => {
-    const hero = await generateUser();
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      achievementPath: 'achievements.streak',
-      achievementVal: 42,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.achievements.streak).to.equal(42);
-    // test hero values
-    await hero.sync();
-    expect(hero.achievements.streak).to.equal(42);
-  });
-
-  it('updates setting numbered achievement to 0', async () => {
-    const hero = await generateUser({ 'achievements.streak': 42 });
-    expect(hero.achievements.streak).to.equal(42);
-    const heroRes = await user.put(`/hall/heroes/${hero._id}`, {
-      achievementPath: 'achievements.streak',
-      achievementVal: 0,
-    });
-
-    // test response
-    expect(heroRes).to.have.all.keys(heroFields);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-
-    // test response values
-    expect(heroRes.achievements.streak).to.equal(0);
-    // test hero values
-    await hero.sync();
-    expect(hero.achievements.streak).to.equal(0);
-  });
 });

test/api/v3/integration/payments/paypal/GET-payments_paypal_checkout_success.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
 } from '../../../../../helpers/api-integration/v3';
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 describe('payments : paypal #checkoutSuccess', () => {
   const endpoint = '/paypal/checkout/success';

test/api/v3/integration/payments/paypal/GET-payments_paypal_subscribe.test.js

@@ -3,7 +3,7 @@ import {
 } from '../../../../../helpers/api-integration/v3';
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
 import shared from '../../../../../../website/common';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 describe('payments : paypal #subscribe', () => {
   const endpoint = '/paypal/subscribe';

test/api/v3/integration/payments/paypal/GET-payments_paypal_subscribe_success.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
 } from '../../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
 
 describe('payments : paypal #subscribeSuccess', () => {

test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js

@@ -7,7 +7,7 @@ import {
 } from '../../../../helpers/api-integration/v3';
 import { quests as questScrolls } from '../../../../../website/common/script/content/quests';
 import { chatModel as Chat } from '../../../../../website/server/models/message';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('POST /groups/:groupId/quests/invite/:questKey', () => {
   let questingGroup;

test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js

@@ -1,5 +1,5 @@
 import { v4 as generateUUID } from 'uuid';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 import {
   generateUser,
   sleep,

test/api/v3/integration/user/POST-user_class_cast_spellId.test.js

@@ -8,7 +8,7 @@ import {
   generateChallenge,
   sleep,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('POST /user/class/cast/:spellId', () => {
   let user;

test/api/v3/integration/user/buy/POST-user_buy.test.js

@@ -5,7 +5,7 @@ import {
   translate as t,
 } from '../../../../../helpers/api-integration/v3';
 import shared from '../../../../../../website/common/script';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 const { content } = shared;
 

test/api/v3/integration/user/buy/POST-user_buy_gear.test.js

@@ -3,7 +3,7 @@
 import {
   generateUser,
 } from '../../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 describe('POST /user/buy-gear/:key', () => {
   let user;

test/api/v3/integration/user/buy/POST-user_buy_quest.test.js

@@ -3,7 +3,7 @@ import {
   translate as t,
 } from '../../../../../helpers/api-integration/v3';
 import shared from '../../../../../../website/common/script';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 const { content } = shared;
 

test/api/v3/integration/user/buy/POST-user_buy_special_spell.test.js

@@ -3,7 +3,7 @@ import {
   translate as t,
 } from '../../../../../helpers/api-integration/v3';
 import shared from '../../../../../../website/common/script';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 const { content } = shared;
 

test/api/v3/integration/user/stats/POST-user_allocate.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   translate as t,
 } from '../../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 
 describe('POST /user/allocate', () => {
   let user;

test/api/v3/integration/webhook/POST-user_add_webhook.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('POST /user/webhook', () => {
   let user; let

test/api/v3/integration/webhook/PUT-user_update_webhook.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('PUT /user/webhook/:id', () => {
   let user; let

test/api/v4/user/POST-user_class_cast_spellId.test.js

@@ -8,7 +8,7 @@ import {
   generateChallenge,
   sleep,
 } from '../../../helpers/api-integration/v4';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('POST /user/class/cast/:spellId', () => {
   let user;

test/common/ops/buy/buy.js

@@ -9,7 +9,7 @@ import {
 } from '../../../../website/common/script/libs/errors';
 import i18n from '../../../../website/common/script/i18n';
 import content from '../../../../website/common/script/content/index';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 describe('shared.ops.buy', () => {
   let user;

test/common/ops/buy/buyMarketGear.js

@@ -11,7 +11,7 @@ import {
   BadRequest, NotAuthorized, NotFound,
 } from '../../../../website/common/script/libs/errors';
 import i18n from '../../../../website/common/script/i18n';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 async function buyGear (user, req, analytics) {
   const buyOp = new BuyMarketGearOperation(user, req, analytics);

test/common/ops/buy/buyMysterySet.js

@@ -10,7 +10,7 @@ import {
   NotFound,
 } from '../../../../website/common/script/libs/errors';
 import i18n from '../../../../website/common/script/i18n';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 describe('shared.ops.buyMysterySet', () => {
   let user;

test/common/ops/buy/buyQuestGold.js

@@ -8,7 +8,7 @@ import {
   NotFound,
 } from '../../../../website/common/script/libs/errors';
 import i18n from '../../../../website/common/script/i18n';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 describe('shared.ops.buyQuest', () => {
   let user;

test/common/ops/buy/buySpell.js

@@ -9,7 +9,7 @@ import {
   generateUser,
 } from '../../../helpers/common.helper';
 import content from '../../../../website/common/script/content/index';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 describe('shared.ops.buySpecialSpell', () => {
   let user;

test/common/ops/buy/hourglassPurchase.js

@@ -8,7 +8,7 @@ import content from '../../../../website/common/script/content/index';
 import {
   generateUser,
 } from '../../../helpers/common.helper';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 import { BuyHourglassMountOperation } from '../../../../website/common/script/ops/buy/buyMount';
 
 describe('common.ops.hourglassPurchase', () => {

test/common/ops/buy/purchase.js

@@ -197,7 +197,7 @@ describe('shared.ops.purchase', () => {
 
     it('purchases quest bundles', async () => {
       const startingBalance = user.balance;
-      const clock = sandbox.useFakeTimers(moment('2024-03-20').valueOf());
+      const clock = sandbox.useFakeTimers(moment('2022-03-16').valueOf());
       const type = 'bundles';
       const key = 'cuddleBuddies';
       const price = 1.75;

test/common/ops/feed.js

@@ -9,7 +9,7 @@ import i18n from '../../../website/common/script/i18n';
 import {
   generateUser,
 } from '../../helpers/common.helper';
-import { errorMessage } from '../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../website/common/script/libs/errorMessage';
 import shared from '../../../website/common/script';
 
 describe('shared.ops.feed', () => {

test/common/ops/hatch.js

@@ -8,7 +8,7 @@ import i18n from '../../../website/common/script/i18n';
 import {
   generateUser,
 } from '../../helpers/common.helper';
-import { errorMessage } from '../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../website/common/script/libs/errorMessage';
 import shared from '../../../website/common/script';
 
 describe('shared.ops.hatch', () => {

test/common/ops/sleep.js

@@ -1,4 +1,4 @@
-import { sleep } from '../../../website/common/script/ops/sleep';
+import sleep from '../../../website/common/script/ops/sleep';
 import {
   generateUser,
 } from '../../helpers/common.helper';

test/common/ops/stats/allocate.js

@@ -7,7 +7,7 @@ import i18n from '../../../../website/common/script/i18n';
 import {
   generateUser,
 } from '../../../helpers/common.helper';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 describe('shared.ops.allocate', () => {
   let user;

test/common/ops/stats/allocateBulk.js

@@ -7,7 +7,7 @@ import i18n from '../../../../website/common/script/i18n';
 import {
   generateUser,
 } from '../../../helpers/common.helper';
-import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
+import errorMessage from '../../../../website/common/script/libs/errorMessage';
 
 describe('shared.ops.allocateBulk', () => {
   let user;

test/helpers/sleep.js

@@ -1 +1 @@
-export { sleep } from '../../website/server/libs/sleep'; // eslint-disable-line import/prefer-default-export
+export { default as sleep } from '../../website/server/libs/sleep'; // eslint-disable-line import/prefer-default-export

test/helpers/start-server.js

@@ -1,12 +1,7 @@
 /* eslint-disable no-process-env */
-/* eslint-disable import/no-commonjs */
-
-const nconf = require('nconf');
-const mongoose = require('mongoose');
-const setupNconf = require('../../website/server/libs/setupNconf');
-
-// fix further imports of require/import syntaxes
-require('@babel/register');
+import nconf from 'nconf';
+import mongoose from 'mongoose';
+import setupNconf from '../../website/server/libs/setupNconf';
 
 if (process.env.LOAD_SERVER === '0') { // when the server is in a different process we simply connect to mongoose
   setupNconf('./config.json');

website/client/.eslintrc.js

@@ -12,19 +12,11 @@ module.exports = {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     // TODO find a way to let eslint understand webpack aliases
-    'import/no-unresolved': 'off',
     'import/no-extraneous-dependencies': 'off',
+    'import/no-unresolved': 'off',
     'import/extensions': 'off',
-    'prefer-regex-literals': 'warn',
     'vue/no-v-html': 'off',
     'vue/no-mutating-props': 'warn',
-    // this creates issues with the current way we have to push the process.env vars to webpack
-    // https://github.com/eslint/eslint/issues/14918
-    // https://github.com/webpack/webpack/issues/5392
-    // off for now, because any eslint --fix will then still do it anyway
-    // maybe this can be turned on again once we switch to newer vue/vite
-    // Important! process.env.XYZ should not be destructured
-    'prefer-destructuring': 'off',
     'vue/html-self-closing': ['error', {
       html: {
         void: 'never',
@@ -35,9 +27,6 @@ module.exports = {
       svg: 'never',
       math: 'never',
     }],
-    'vue/component-tags-order': ['warn', {
-      order: ['template', 'style', 'script'],
-    }],
   },
   parserOptions: {
     parser: 'babel-eslint',

website/client/package.json

@@ -12,24 +12,24 @@
   },
   "dependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^4.5.19",
     "@vue/cli-plugin-router": "^5.0.8",
     "@vue/cli-plugin-unit-mocha": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
+    "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
     "amplitude-js": "^8.21.3",
-    "axios": "^0.28.0",
+    "axios": "^0.27.2",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
     "bootstrap": "^4.6.0",
     "bootstrap-vue": "^2.23.1",
-    "chai": "^5.1.0",
+    "chai": "^4.3.7",
     "core-js": "^3.33.1",
     "dompurify": "^3.0.3",
-    "eslint": "7.32.0",
-    "eslint-config-habitrpg": "6.2.0",
-    "eslint-plugin-mocha": "5.3.0",
-    "eslint-plugin-vue": "7.20.0",
+    "eslint": "^7.32.0",
+    "eslint-config-habitrpg": "^6.2.3",
+    "eslint-plugin-mocha": "^5.3.0",
+    "eslint-plugin-vue": "^7.20.0",
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.20.0",
     "inspectpack": "^4.7.1",
@@ -39,9 +39,13 @@
     "moment": "^2.29.4",
     "nconf": "^0.12.1",
     "sass": "^1.63.4",
-    "sass-loader": "^14.1.1",
+    "sass-loader": "^8.0.2",
     "smartbanner.js": "^1.19.3",
     "stopword": "^2.0.8",
+    "svg-inline-loader": "^0.8.2",
+    "svg-url-loader": "^7.1.1",
+    "svgo": "^1.3.2",
+    "svgo-loader": "^2.2.1",
     "uuid": "^9.0.1",
     "validator": "^13.9.0",
     "vue": "^2.7.10",
@@ -52,7 +56,7 @@
     "vue-template-compiler": "^2.7.10",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
-    "webpack": "^5.89.0"
+    "webpack": "^4.47.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.21.0"

website/client/public/index.html

@@ -27,9 +27,9 @@
   </head>
   <body>
     <div id="loading-screen">
-      <svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-      <path fill-rule="evenodd" clip-rule="evenodd" d="M31.62 28.86c-.32-.706-1.057-1.048-1.538-.706-.48.341-1.147.393-1.78.24-.633-.153-.753-1.604-.616-3.278.136-1.673.363-2.318.506-2.925.162-.61.877-.562.962-.084.086.479.582.479 1.307-.391.724-.87.617-3.409-.218-5.474-.836-2.065.326-1.865.664-1.66.337.205.544-.102.462-1.28-.082-1.178-1.166-2.098-2.039-2.663-.873-.564-1.936-1.186-1.911-2.697.025-1.511 2.08-1.464 2.358-1.439.279.025.815-.093.506-1.663-.31-1.57-1.43-1.869-2.133-1.826-.703.042-1.177.428-2.17.053-.995-.376-1.655-.23-2.58-.023-.926.206-2.138.776-3.646 1.183-.795.219-1.064.274-1.93.288-.532.008-.755.653-.043 1.444.563.643 1.839.814 2.606.707.494-.07.608.258.563.74a8.013 8.013 0 0 0-.01 1.795c.08.6.18 1.62-.103 2.286-.14.326-.545.677-.98.653-.565-.034-1.022-.7-1.414-1.49-.825-1.662-1.793-2.014-5.404-3.535-3.248-1.367-5.007-3.5-6.096-4.874-.969-1.217-1.939-.756-1.85.342.07.852.592 3.604 1.912 5.257 1.623 2.525 4.128 3.67 7.013 3.895.755.06 1.226.208 1.29.553.095.735-.622 1.244-1.959 1.09-1.336-.157-1.907.087-1.641.848.85 1.79 2.809 1.869 3.623 1.942.275.05 1.246 0 1.764.143.605.166.735 1.005-.14 1.459-1.558.76-2.237 1.391-3.025 2.83-.595 1.13-1.108 3.022-.574 5.745.513 2.648-3.337 2.733-5 2.357-.716-.151-1.47-1.512.287-2.65 1.421-.922 1.708-1.49 1.645-2.657-.074-1.36-.824-1.458-.822-2.64v-2.82a.435.435 0 0 0-.435-.435H7.698a.435.435 0 0 1-.435-.434v-1.7a.435.435 0 0 0-.435-.435H5.501a.435.435 0 0 1-.435-.435v-1.524a.435.435 0 0 0-.435-.435H3.015a.435.435 0 0 1-.435-.435v-1.603a.435.435 0 0 0-.435-.434H.435a.435.435 0 0 0-.435.434v1.705c0 .24.195.435.435.435h1.62c.24 0 .435.195.435.435v6.076c0 .241.195.435.435.435h1.71c.241 0 .436.196.436.435v1.988c0 .24.195.434.435.434h2.402c.734-.052.862.934.854 1.286-.016.803-.923 1.06-1.352 1.395-1.145.884-2.031 1.783-1.513 3.512l.013.036c.945 2.007 3.542 1.8 5.183 1.8h10.326c.584 0 1.184.135 1.046-.545-.136-.68-.425-1.61-1.265-1.61-.84 0-.703.467-1.524.228-.821-.238-.822-1.348.411-3.279 1.276-1.649 3.46-1.524 4.781-.358 1.32 1.166.93 3.191.653 4.354-.158.82.218 1.224.669 1.213h5.242c.806-.014.647-.556.185-1.614h.003z" fill="#fff"/>
-    </svg>
+      <svg id="melior" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 61.91 64">
+        <path d="M61.82,64H51.59c-3.08,0-3.72.37-3.67-1,0.07-1.87.67-1.94,2.63-2.49,1.63-.45,1-3.35-0.8-5.88-1.28-1.76-3.89-3.81-7.31-2.22a10.75,10.75,0,0,0-4.56,3.52c-1.68,2.33-1.59,4.54,1,4.54s5.39-1.5,6.23.64c1,2.64.33,2.89-.18,2.89H28.55v0C19.77,64,11,63.93,9,58.38c-2.82-7.68,7.43-10.64,7.75-15.46,0.13-2-1-2.85-2.34-2.85h-6V36.41H4.7v-11H8.36V29.1H12v3.65h3.65v5.08a5.76,5.76,0,0,1,3.07,5.05c-0.17,5.51-9.5,8.57-7.79,14.35,1.56,5.29,13.37,4,13,.74L23.7,56.1c-0.06-2.62-.47-6.12.08-9.22C24.64,42,27.67,37.78,33,37.74c1,0,1.78-.21,1.78-1s-1.55-.84-2.64-0.95a23.35,23.35,0,0,1-12.56-5c-2.43-2-6.21-8.3-3.74-7.83a21.74,21.74,0,0,0,4.06.4c1.24,0,4.44-.35,4.44-1.11,0-1-1.85-.42-4.57-0.68C16.48,21.22,9.6,19.83,6,9.35,4.71,5.43,3.83-1.91,6,.46c12.46,13.7,16.69,11.47,23.84,16.16,3.15,2.06,5.19,7,7,6.58,1.2-.27.46-1.37,0.64-3.93C37.66,17,38.75,16.48,36,15.79c-3.26-.81-6.52-4.38-4.39-4.33a11.89,11.89,0,0,0,5.53-.76c1.87-.81,6.43-4.28,9.18-2.89s5.08-.6,6.94-0.25c2.71,0.51,3.41,4.24,3.05,6.42-0.22,1.38-.22,1.38-2,1.28-3.61-.21-4.53,2.67-2,4.25,3.87,2.42,5.51,4.23,6.56,9.58,0.51,2.6.1,3.2-.76,2.72s-2.34-.72-0.29,4-1.29,10.28-2.39,10.9a1.3,1.3,0,0,0-.91,1.34c0,11.42,0,12.27,1.92,12.48,2.9,0.31,4.14-1.44,5.27.06C63.29,62.73,63.41,64,61.82,64ZM4.7,21.28H1v3.65H4.7V21.28Z" transform="translate(-1.05)" fill="#fff" />
+      </svg>
     </div>
 
     <div id="app"></div>

website/client/src/app.vue

@@ -9,19 +9,14 @@
           <!-- eslint-disable max-len -->
           <svg
             id="melior"
-            class="color svg svg-icon"
             xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 80 80"
+            viewBox="0 0 61.91 64"
           >
-            // eslint-disable-next-line vue/html-self-closing
             <path
-              xmlns="http://www.w3.org/2000/svg"
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M79.05 72.15c-.8-1.766-2.643-2.62-3.845-1.766-1.201.855-2.867.985-4.448.602-1.584-.385-1.885-4.01-1.543-8.195.342-4.184.909-5.795 1.267-7.314.404-1.524 2.191-1.404 2.405-.209.215 1.196 1.454 1.196 3.266-.979 1.811-2.175 1.543-8.52-.546-13.684-2.088-5.163.817-4.661 1.66-4.149.844.513 1.362-.255 1.156-3.2-.204-2.945-2.916-5.247-5.096-6.657-2.184-1.41-4.842-2.967-4.78-6.745.063-3.777 5.2-3.658 5.897-3.596.697.063 2.037-.233 1.264-4.157-.773-3.924-3.575-4.673-5.332-4.567-1.758.106-2.943 1.071-5.427.133-2.484-.938-4.136-.572-6.45-.057-2.313.515-5.343 1.94-9.112 2.959-1.989.545-2.661.683-4.828.718-1.33.02-1.885 1.633-.106 3.61 1.408 1.608 4.597 2.036 6.515 1.768 1.236-.174 1.521.645 1.407 1.85a20.023 20.023 0 0 0-.024 4.488c.198 1.5.45 4.051-.258 5.713-.35.817-1.361 1.693-2.449 1.633-1.413-.084-2.555-1.75-3.537-3.726-2.06-4.152-4.48-5.033-13.509-8.835-8.12-3.417-12.516-8.749-15.24-12.185-2.421-3.042-4.846-1.89-4.626.855.179 2.128 1.48 9.008 4.781 13.141 4.058 6.314 10.32 9.177 17.534 9.739 1.885.149 3.065.52 3.225 1.383.236 1.835-1.557 3.11-4.898 2.722-3.341-.39-4.768.22-4.103 2.121 2.123 4.477 7.021 4.672 9.058 4.857.686.122 3.114 0 4.41.355 1.51.418 1.836 2.514-.353 3.648-3.892 1.903-5.59 3.479-7.561 7.075-1.486 2.826-2.77 7.555-1.435 14.365 1.283 6.62-8.342 6.83-12.497 5.89-1.793-.377-3.675-3.778.716-6.625 3.553-2.305 4.269-3.724 4.111-6.642-.184-3.4-2.058-3.644-2.053-6.598v-7.05c0-.602-.488-1.088-1.087-1.088h-3.334a1.087 1.087 0 0 1-1.087-1.087v-4.25c0-.602-.488-1.087-1.088-1.087h-3.317a1.087 1.087 0 0 1-1.087-1.088v-3.81c0-.602-.489-1.087-1.088-1.087h-4.04a1.087 1.087 0 0 1-1.089-1.088V26.25c0-.602-.488-1.088-1.087-1.088H1.088C.485 25.161 0 25.65 0 26.25v4.26c0 .602.488 1.087 1.088 1.087h4.049c.602 0 1.087.489 1.087 1.088v15.192c0 .602.489 1.087 1.088 1.087h4.277c.602 0 1.088.489 1.088 1.088v4.968c0 .602.488 1.087 1.087 1.087h6.005c1.836-.13 2.156 2.335 2.137 3.214-.04 2.007-2.308 2.652-3.382 3.487-2.861 2.21-5.077 4.459-3.78 8.781l.032.09c2.362 5.017 8.855 4.499 12.956 4.499h25.817c1.459 0 2.959.339 2.614-1.362-.342-1.7-1.063-4.024-3.162-4.024-2.1 0-1.758 1.166-3.81.57-2.054-.597-2.057-3.371 1.027-8.198 3.19-4.122 8.652-3.81 11.952-.895 3.301 2.915 2.325 7.978 1.633 10.885-.396 2.048.545 3.06 1.67 3.032H78.58c2.015-.035 1.62-1.391.464-4.035h.008z"
+              d="M61.82,64H51.59c-3.08,0-3.72.37-3.67-1,0.07-1.87.67-1.94,2.63-2.49,1.63-.45,1-3.35-0.8-5.88-1.28-1.76-3.89-3.81-7.31-2.22a10.75,10.75,0,0,0-4.56,3.52c-1.68,2.33-1.59,4.54,1,4.54s5.39-1.5,6.23.64c1,2.64.33,2.89-.18,2.89H28.55v0C19.77,64,11,63.93,9,58.38c-2.82-7.68,7.43-10.64,7.75-15.46,0.13-2-1-2.85-2.34-2.85h-6V36.41H4.7v-11H8.36V29.1H12v3.65h3.65v5.08a5.76,5.76,0,0,1,3.07,5.05c-0.17,5.51-9.5,8.57-7.79,14.35,1.56,5.29,13.37,4,13,.74L23.7,56.1c-0.06-2.62-.47-6.12.08-9.22C24.64,42,27.67,37.78,33,37.74c1,0,1.78-.21,1.78-1s-1.55-.84-2.64-0.95a23.35,23.35,0,0,1-12.56-5c-2.43-2-6.21-8.3-3.74-7.83a21.74,21.74,0,0,0,4.06.4c1.24,0,4.44-.35,4.44-1.11,0-1-1.85-.42-4.57-0.68C16.48,21.22,9.6,19.83,6,9.35,4.71,5.43,3.83-1.91,6,.46c12.46,13.7,16.69,11.47,23.84,16.16,3.15,2.06,5.19,7,7,6.58,1.2-.27.46-1.37,0.64-3.93C37.66,17,38.75,16.48,36,15.79c-3.26-.81-6.52-4.38-4.39-4.33a11.89,11.89,0,0,0,5.53-.76c1.87-.81,6.43-4.28,9.18-2.89s5.08-.6,6.94-0.25c2.71,0.51,3.41,4.24,3.05,6.42-0.22,1.38-.22,1.38-2,1.28-3.61-.21-4.53,2.67-2,4.25,3.87,2.42,5.51,4.23,6.56,9.58,0.51,2.6.1,3.2-.76,2.72s-2.34-.72-0.29,4-1.29,10.28-2.39,10.9a1.3,1.3,0,0,0-.91,1.34c0,11.42,0,12.27,1.92,12.48,2.9,0.31,4.14-1.44,5.27.06C63.29,62.73,63.41,64,61.82,64ZM4.7,21.28H1v3.65H4.7V21.28Z"
+              transform="translate(-1.05)"
               fill="#fff"
-            >
-            </path>
+            ></path>
           </svg>
           <!-- eslint-enable max-len -->
         </div>
@@ -96,11 +91,8 @@
 
   #loading-screen-inapp {
     #melior {
-      color: $white;
-      height: 80px;
       margin: 0 auto;
-      object-fit: contain;
-      width: 80px;
+      width: 70.9px;
     }
 
     .row {

website/client/src/assets/css/sprites.css

@@ -22,7 +22,7 @@
   height: 219px;
 }
 
-.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi {
+.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet {
   width: 68px;
   height: 68px;
 }
@@ -43,10 +43,6 @@
   background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_VirtualPet.gif") no-repeat;
 }
 
-.Pet_HatchingPotion_Fungi {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungi.gif") no-repeat;
-}
-
 .Gems {
   display:inline-block;
   margin-right:5px;

website/client/src/assets/images/group-plans-static/party.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 386 200">
+<svg xmlns="http://www.w3.org/2000/svg" width="386" height="200" viewBox="0 0 386 200">
     <g fill="none" fill-rule="evenodd">
         <g fill="#34313A" opacity=".12">
             <path d="M10.811 125.405h86.486v10.811H10.811z"/>

website/client/src/assets/images/group-plans-static/top.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 1440 480">
+<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="480" viewBox="0 0 1440 480">
     <g fill="none" fill-rule="nonzero">
         <path fill="#FEFEFE" d="M1002.873 423.48c98.309-13.08 200.935-19.32 301.582-11.64 46.05 3.42 91.473 9.96 135.545 20.04V480H681.054c104.245-19.92 207.59-40.86 312.645-55.32 3.058-.42 6.116-.78 9.174-1.2z"/>
         <path fill="#FDFDFD" d="M.9 0H1440v431.88c-44.072-10.08-89.494-16.68-135.545-20.1-100.647-7.62-203.273-1.44-301.582 11.64-3.058.42-6.116.84-9.174 1.2-105.054 14.4-208.4 35.4-312.645 55.32H.9V0z"/>

website/client/src/assets/images/home/forbes.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 92 24">
+<svg xmlns="http://www.w3.org/2000/svg" width="92" height="24" viewBox="0 0 92 24">
     <path fill="#D5C8FF" fill-rule="evenodd" d="M46.237 7.124c0 .2-1.6 4.43-1.69 4.464-.042.016-.355-.103-.694-.266-.707-.34-1.37-.505-2.014-.504-.802.002-1.698.297-2.052.677-.151.162-.152.172-.19 2.595-.037 2.4.043 5.327.178 6.504.115 1.003.382 1.496.932 1.726.184.077 1.345.236 1.725.237.028 0 .043.23.033.51l-.02.512-4.88.016c-2.685.008-4.92-.009-4.966-.04-.06-.037-.08-.19-.066-.51l.02-.455.23-.05c.127-.026.4-.08.606-.119.639-.119 1.006-.465 1.212-1.144.169-.553.243-2.323.246-5.876.005-4.345-.085-5.372-.525-5.953-.238-.316-.41-.405-.987-.516a70.373 70.373 0 0 1-.667-.13c-.132-.028-.149-.071-.149-.395 0-.314.02-.37.149-.423.197-.082 6.73-1.388 6.94-1.388h.162l-.032.973a295.85 295.85 0 0 1-.062 1.731l-.03.759.236-.427C40.64 8.266 41.49 7.417 42.62 6.9c.62-.285 1.034-.37 1.8-.37.909 0 1.817.297 1.817.594zm-27.433-.08l-.47.143c-.705.215-.701.217-1.019-.623-.78-2.065-1.675-3.255-2.9-3.856-.844-.414-1.234-.464-3.62-.464H8.72l-.035.346c-.068.65-.174 4.826-.173 6.793l.001 1.962.61-.003c.336-.002.997-.027 1.47-.055.711-.043.923-.08 1.22-.218.732-.339 1.229-1.084 1.534-2.297l.157-.626.538-.019.538-.02v7.926l-.538-.02-.538-.018-.153-.627c-.288-1.177-.84-2.02-1.523-2.322-.316-.14-1.096-.219-2.606-.265l-.709-.021v1.488c0 1.622.09 3.817.203 5.008.16 1.66.584 2.578 1.346 2.91.146.063.606.166 1.023.229.417.062.81.14.874.173.16.083.17.943.011 1.004-.125.048-11.764.044-11.882-.004-.055-.022-.083-.186-.083-.49 0-.547-.035-.522 1.022-.719.811-.15 1.101-.304 1.46-.773.693-.91.843-2.663.845-9.878.002-6.776-.13-8.202-.847-9.25-.319-.464-.855-.716-1.754-.824l-.693-.083-.019-.54L0 .47.217.431c.12-.02 4.312-.03 9.316-.02l9.1.02.043.263c.023.145.062 1.633.085 3.307l.043 3.044zM91.73 18.624c-.028.831-.054 1.002-.243 1.56-.617 1.819-2.008 3.016-4.158 3.578-.728.19-.832.2-2.28.215-.833.01-1.635.004-1.78-.011-1.175-.126-3.045-.536-3.667-.803l-.305-.13-.041-1.508c-.023-.828-.05-1.936-.058-2.462l-.017-.955.182-.088c.1-.048.302-.093.45-.1l.267-.012.227.56c.889 2.188 1.931 3.367 3.292 3.726.52.136 1.493.138 1.877.002 1.077-.38 1.668-1.196 1.673-2.31.006-1.318-.72-1.952-3.458-3.022-1.697-.663-2.29-1.004-2.994-1.725-.76-.779-1.125-1.664-1.194-2.898-.083-1.491.384-2.748 1.418-3.82 1.04-1.077 2.391-1.661 4.232-1.83 1.62-.147 4.107.197 5.41.749l.238.1.043 1.343c.023.739.047 1.729.053 2.2l.012.858-.32.118c-.504.188-.538.164-.819-.58-.787-2.086-1.701-3.072-3.126-3.374-.869-.184-1.594.014-2.122.578-.41.44-.571.83-.61 1.486-.043.71.085 1.094.519 1.57.535.585 1.411 1.09 3.158 1.82 2.139.894 3.16 1.653 3.714 2.762.36.72.463 1.296.427 2.403zm-18.987-5.341c-1.377.077-4.333.115-4.37.057-.049-.08.074-1.254.196-1.862.294-1.466.764-2.524 1.41-3.176.348-.35.507-.46.79-.544.196-.058.417-.105.492-.105.303 0 .66.155.926.4.713.658 1.121 2.07 1.202 4.16l.04 1.032-.686.038zm5.483-.057c-.305-2.964-1.505-5.005-3.544-6.027-1.811-.907-4.61-.842-6.656.156-1.94.945-3.274 2.523-4.019 4.748-.388 1.16-.51 2.093-.471 3.596.025.95.068 1.441.166 1.88.765 3.412 3.105 5.733 6.377 6.323.72.13 2.356.133 3.084.005 1.04-.182 2.238-.644 2.994-1.155.923-.623 1.87-1.56 1.87-1.85 0-.178-.318-.587-.456-.587-.06 0-.316.134-.57.298-.902.583-1.765.823-2.965.823-1.655 0-2.705-.413-3.76-1.478-.466-.471-.658-.725-.9-1.192-.531-1.028-.818-2.21-.861-3.545l-.019-.577 4.88-.017 4.881-.016.022-.33a8.664 8.664 0 0 0-.053-1.055zM57.164 17.31c-.303 1.922-.855 3.405-1.623 4.363-.372.464-.99.904-1.474 1.047-.312.093-.98.115-1.576.052-.133-.014-.276-.066-.317-.115-.113-.137-.235-9.09-.16-11.709l.06-2.077.528-.152c.778-.225 1.616-.19 2.21.092 1.193.565 1.977 1.962 2.384 4.248.133.744.113 3.33-.032 4.251zm4.914-4.812C61.421 9.488 59.541 7.41 57 6.883c-.388-.08-.74-.097-1.496-.07-1.138.039-1.921.21-2.771.602-.282.13-.528.237-.547.237-.019 0-.016-1.722.006-3.825C52.224.862 52.215 0 52.154 0c-.215-.004-6.95 1.281-7.024 1.34-.056.044-.079.186-.066.402.022.375-.023.345.798.53.247.055.536.162.643.238.274.195.502.618.66 1.223.124.478.141.82.199 4.05.058 3.299.047 6.69-.044 12.902l-.038 2.58.484.11c.698.16 2.697.492 3.352.558.96.098 3.197.084 3.909-.023 3.093-.466 5.424-2.26 6.51-5.01.289-.729.566-1.852.663-2.685.113-.978.05-2.93-.122-3.716zM27.57 17.4c-.217 3.078-.885 4.747-2.131 5.327-.452.21-1.25.222-1.687.024-1.084-.492-1.852-1.986-2.237-4.35-.244-1.498-.267-4.83-.045-6.462.313-2.293.972-3.648 2-4.105.704-.314 1.68-.129 2.307.438 1.393 1.26 2.097 4.84 1.793 9.128zm4.956-3.515c-.345-2.926-1.586-5.069-3.634-6.274-2.276-1.34-5.735-1.417-8.192-.184-1.774.89-3.224 2.607-3.868 4.578-.665 2.033-.664 4.703 0 6.779.426 1.33 1.004 2.3 1.895 3.182 1.068 1.059 2.467 1.735 4.066 1.968.573.084 2.379.085 2.97.003.28-.039.765-.145 1.077-.235 2.9-.84 4.878-3.067 5.557-6.256.166-.78.235-2.667.13-3.56z"/>
 </svg>