chore(node): upgrade to Node 20

.eslintrc.js

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

.github/workflows/test.yml

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

.nvmrc

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

Dockerfile-Dev

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

config.json.example

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

package.json

@@ -78,8 +78,8 @@
   },
   "private": true,
   "engines": {
-    "node": "^14",
-    "npm": "^6"
+    "node": "20",
+    "npm": "^10"
   },
   "scripts": {
     "lint": "eslint --ext .js --fix . && cd website/client && npm run lint",
@@ -123,6 +123,5 @@
     "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/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/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_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/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/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 { default as sleep } from '../../website/server/libs/sleep'; // eslint-disable-line import/prefer-default-export
+export { sleep } from '../../website/server/libs/sleep'; // eslint-disable-line import/prefer-default-export

test/helpers/start-server.js

@@ -1,7 +1,12 @@
 /* eslint-disable no-process-env */
-import nconf from 'nconf';
-import mongoose from 'mongoose';
-import setupNconf from '../../website/server/libs/setupNconf';
+/* 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');
 
 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,11 +12,19 @@ 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-extraneous-dependencies': 'off',
     'import/no-unresolved': 'off',
+    'import/no-extraneous-dependencies': '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',
@@ -27,6 +35,9 @@ module.exports = {
       svg: 'never',
       math: 'never',
     }],
+    'vue/component-tags-order': ['warn', {
+      order: ['template', 'style', 'script'],
+    }],
   },
   parserOptions: {
     parser: 'babel-eslint',

website/client/package.json

@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^4.5.19",
+    "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/cli-plugin-router": "^5.0.8",
     "@vue/cli-plugin-unit-mocha": "^5.0.8",
-    "@vue/cli-service": "^4.5.15",
+    "@vue/cli-service": "^5.0.8",
     "@vue/test-utils": "1.0.0-beta.29",
     "amplitude-js": "^8.21.3",
     "axios": "^0.27.2",
@@ -26,10 +26,10 @@
     "chai": "^4.3.7",
     "core-js": "^3.33.1",
     "dompurify": "^3.0.3",
-    "eslint": "^7.32.0",
-    "eslint-config-habitrpg": "^6.2.3",
-    "eslint-plugin-mocha": "^5.3.0",
-    "eslint-plugin-vue": "^7.20.0",
+    "eslint": "7.32.0",
+    "eslint-config-habitrpg": "6.2.0",
+    "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",
@@ -42,10 +42,6 @@
     "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",
@@ -56,7 +52,7 @@
     "vue-template-compiler": "^2.7.10",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
-    "webpack": "^4.47.0"
+    "webpack": "^5.89.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.21.0"

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

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="386" height="200" viewBox="0 0 386 200">
+<svg xmlns="http://www.w3.org/2000/svg"  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" width="1440" height="480" viewBox="0 0 1440 480">
+<svg xmlns="http://www.w3.org/2000/svg"  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" width="92" height="24" viewBox="0 0 92 24">
+<svg xmlns="http://www.w3.org/2000/svg"  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>

website/client/src/assets/images/home/google-play-badge.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="135" height="40" viewBox="0 0 135 40">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 135 40">
     <g fill="none" fill-rule="nonzero">
         <path fill="#36205D" d="M130 40H5c-2.8 0-5-2.2-5-5V5c0-2.8 2.2-5 5-5h125c2.8 0 5 2.2 5 5v30c0 2.7-2.2 5-5 5z"/>
         <path fill="#BDA8FF" d="M130 .8c2.3 0 4.2 1.9 4.2 4.2v30c0 2.3-1.9 4.2-4.2 4.2H5C2.7 39.2.8 37.3.8 35V5C.8 2.7 2.7.8 5 .8h125zm0-.8H5C2.2 0 0 2.2 0 5v30c0 2.8 2.2 5 5 5h125c2.8 0 5-2.2 5-5V5c0-2.7-2.2-5-5-5z"/>

website/client/src/assets/images/home/ios-app-store.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="135" height="40" viewBox="0 0 135 40">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 135 40">
     <g fill="none" fill-rule="nonzero">
         <path fill="#BDA8FF" d="M130.197 40H4.729A4.74 4.74 0 0 1 0 35.267V4.726A4.733 4.733 0 0 1 4.729 0h125.468C132.803 0 135 2.12 135 4.726v30.541c0 2.605-2.197 4.733-4.803 4.733z"/>
         <path fill="#36205D" d="M134.032 35.268a3.83 3.83 0 0 1-3.834 3.83H4.729a3.835 3.835 0 0 1-3.839-3.83V4.725A3.84 3.84 0 0 1 4.729.89h125.468a3.834 3.834 0 0 1 3.834 3.835l.001 30.543z"/>

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

@@ -1,20 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="444" height="528" viewBox="0 0 444 528">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  viewBox="0 0 444 528">
     <defs>
         <linearGradient id="b" x1="100%" x2="0%" y1="100%" y2="0%">
             <stop offset="0%" stop-color="#4F2A93"/>
             <stop offset="100%" stop-color="#6133B4"/>
         </linearGradient>
-        <rect id="a" width="216" height="384" rx="2"/>
+        <rect id="a"  rx="2"/>
         <path id="c" d="M236.147 458.522c0 .69-.558 1.249-1.246 1.249H13.769a1.247 1.247 0 0 1-1.246-1.25V63.268c0-.69.557-1.249 1.246-1.249H234.9c.688 0 1.246.56 1.246 1.25v395.254z"/>
     </defs>
     <g fill="none" fill-rule="evenodd">
         <g transform="translate(196 24)">
-            <rect width="243.6" height="480" fill="#D5C8FF" stroke="#9A62FF" stroke-width="8" rx="16"/>
+            <rect  fill="#D5C8FF" stroke="#9A62FF" stroke-width="8" rx="16"/>
             <path fill="#9A62FF" d="M166.8 24a4.805 4.805 0 0 0-4.8 4.8c0 2.647 2.153 4.8 4.8 4.8s4.8-2.153 4.8-4.8-2.153-4.8-4.8-4.8m0 2.743a2.057 2.057 0 1 1 0 4.114 2.057 2.057 0 0 1 0-4.114"/>
-            <rect width="218.4" height="386.4" x="12.6" y="46.8" fill="#4F2A93" rx="2"/>
-            <rect width="42" height="4.8" x="100.8" y="14.4" fill="#9A62FF" rx="2.4"/>
-            <rect width="18" height="8.4" x="72" y="24.6" fill="#9A62FF" rx="4.2"/>
-            <rect width="42" height="4.8" x="100.8" y="460.8" fill="#9A62FF" rx="2.4"/>
+            <rect  x="12.6" y="46.8" fill="#4F2A93" rx="2"/>
+            <rect  x="100.8" y="14.4" fill="#9A62FF" rx="2.4"/>
+            <rect  x="72" y="24.6" fill="#9A62FF" rx="4.2"/>
+            <rect  x="100.8" y="460.8" fill="#9A62FF" rx="2.4"/>
         </g>
         <use fill="url(#b)" transform="translate(209.8 72)" xlink:href="#a"/>
         <g fill="#FFF">

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

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="205" height="24" viewBox="0 0 205 24">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 205 24">
     <g fill="none" fill-rule="evenodd">
         <path fill="#D5C8FF" d="M7.48 8.294l4.22-6.117C12.5 1.026 13.53.449 14.794.449c1.03 0 1.922.366 2.675 1.097.754.731 1.13 1.607 1.13 2.626 0 .754-.199 1.418-.598 1.995L14.194 11.7l4.654 5.9c.465.589.698 1.276.698 2.062 0 1.042-.366 1.936-1.097 2.684-.731.749-1.618 1.122-2.66 1.122-1.14 0-2.01-.37-2.609-1.114l-5.7-7.113v3.923c0 1.119-.195 1.989-.582 2.61-.71 1.13-1.74 1.694-3.092 1.694-1.23 0-2.183-.415-2.859-1.246C.315 21.458 0 20.444 0 19.18V4.637c0-1.196.321-2.182.964-2.958C1.64.86 2.57.45 3.756.45c1.13 0 2.072.41 2.826 1.23.42.455.687.914.798 1.38.066.288.1.825.1 1.612v3.623zm20.967-3.207v14.078c0 1.219-.316 2.22-.948 3.008-.676.864-1.612 1.296-2.809 1.296-1.097 0-2.022-.404-2.775-1.213-.632-.676-.948-1.707-.948-3.091V5.087c0-1.574.316-2.716.948-3.425.72-.81 1.645-1.213 2.775-1.213s2.056.399 2.776 1.197c.654.73.98 1.878.98 3.44zM41.907 0c2.759-.011 5.296.914 7.612 2.776 1.817 1.462 2.726 2.975 2.726 4.538 0 1.329-.554 2.36-1.662 3.091a3.637 3.637 0 0 1-2.06.632c-.61 0-1.192-.144-1.746-.432-.233-.122-.81-.682-1.729-1.68-.853-.93-1.923-1.396-3.208-1.396-1.24 0-2.28.43-3.116 1.289-.837.858-1.255 1.908-1.255 3.15 0 1.23.418 2.274 1.255 3.133.836.859 1.87 1.288 3.1 1.288 1.019 0 1.966-.343 2.842-1.03.542-.521 1.08-1.042 1.612-1.563.576-.499 1.308-.748 2.194-.748 1.02 0 1.903.357 2.65 1.072.749.714 1.123 1.582 1.123 2.601 0 1.385-.815 2.787-2.444 4.205-2.282 1.995-4.92 2.992-7.911 2.992-1.851 0-3.596-.393-5.236-1.18a11.79 11.79 0 0 1-4.945-4.397 11.617 11.617 0 0 1-1.836-6.34c0-3.435 1.274-6.36 3.823-8.776C35.946 1.097 38.682.022 41.906 0zm19.198 8.294l4.221-6.117c.798-1.151 1.828-1.728 3.092-1.728 1.03 0 1.922.366 2.676 1.097.753.731 1.13 1.607 1.13 2.626 0 .754-.2 1.418-.598 1.995L67.819 11.7l4.654 5.9c.466.588.698 1.275.698 2.062 0 1.042-.365 1.936-1.096 2.684-.732.748-1.618 1.122-2.66 1.122-1.141 0-2.01-.37-2.61-1.114l-5.7-7.113v3.923c0 1.119-.194 1.989-.582 2.61-.71 1.13-1.74 1.694-3.092 1.694-1.23 0-2.183-.415-2.859-1.246-.631-.765-.947-1.779-.947-3.042V4.637c0-1.196.322-2.182.964-2.958.676-.82 1.607-1.23 2.792-1.23 1.13 0 2.072.41 2.826 1.23.421.455.687.914.798 1.38.067.288.1.825.1 1.612v3.623z"/>
         <path fill="#BDA8FF" d="M77.852 14.726c.831 0 1.717.366 2.66 1.097 1.173.92 1.977 1.38 2.41 1.38.642 0 .963-.332.963-.997 0-.366-.188-.676-.565-.931-.2-.133-1.32-.559-3.358-1.28-3.335-1.174-5.002-3.346-5.002-6.516 0-2.392.88-4.282 2.642-5.667C79.142.605 81.05 0 83.32 0c1.961 0 3.667.469 5.12 1.404 1.45.937 2.176 2.142 2.176 3.616 0 .887-.274 1.626-.822 2.219-.549.592-1.26.889-2.136.889-.92 0-1.94-.438-3.058-1.313-.698-.543-1.225-.814-1.58-.814-.609 0-.914.299-.914.897 0 .565.754 1.08 2.261 1.546 2.083.654 3.695 1.451 4.836 2.393 1.519 1.263 2.278 3.037 2.278 5.319 0 2.483-.853 4.421-2.56 5.818-1.584 1.296-3.645 1.944-6.183 1.944s-4.637-.675-6.3-2.028c-1.329-1.074-1.994-2.332-1.994-3.773 0-.964.327-1.767.981-2.41.654-.642 1.463-.97 2.427-.98zM97.863 7.58h-1.977c-1.097 0-2.006-.3-2.726-.898-.765-.643-1.147-1.501-1.147-2.576 0-.643.18-1.26.54-1.854.36-.592.826-1.013 1.397-1.263.57-.25 1.925-.374 4.064-.374h7.546c1.85 0 3.047.111 3.59.333.598.243 1.083.662 1.454 1.254.371.593.557 1.217.557 1.87 0 1.03-.41 1.929-1.23 2.693-.587.543-1.546.815-2.875.815h-1.712v11.302c0 1.23-.21 2.182-.632 2.858-.71 1.13-1.734 1.696-3.075 1.696-1.34 0-2.37-.516-3.092-1.546-.454-.643-.681-1.617-.681-2.925V7.58zm18.184 12.781c-.355.842-.72 1.468-1.097 1.878-.753.82-1.668 1.23-2.742 1.23-1.319 0-2.344-.532-3.075-1.596a3.68 3.68 0 0 1-.648-2.127c0-.654.155-1.313.465-1.978l7.097-15.108c.687-1.474 1.834-2.211 3.44-2.211 1.63 0 2.798.759 3.508 2.277l7.164 15.225c.288.61.432 1.214.432 1.812a3.57 3.57 0 0 1-.865 2.36c-.753.898-1.717 1.346-2.891 1.346-.965 0-1.768-.299-2.41-.898-.478-.442-.953-1.18-1.43-2.21h-6.948zm31.073-5.8l1.762 2.825c.487.786.731 1.596.731 2.426 0 1.053-.363 1.926-1.089 2.618-.725.693-1.614 1.04-2.666 1.04-1.353 0-2.377-.577-3.076-1.73l-3.125-5.119v3.075c0 1.053-.346 1.945-1.039 2.676-.692.731-1.565 1.097-2.618 1.097-1.285 0-2.26-.46-2.925-1.38-.598-.808-.897-1.872-.897-3.191V4.92c0-2.87 1.546-4.305 4.637-4.305h4.754c1.562 0 3.013.452 4.354 1.355 1.341.903 2.322 2.075 2.942 3.516.465 1.085.698 2.176.698 3.273 0 2.05-.814 3.984-2.443 5.801zm8.889-6.981h-1.978c-1.098 0-2.006-.3-2.726-.898-.765-.643-1.147-1.501-1.147-2.576 0-.643.18-1.26.54-1.854.36-.592.825-1.013 1.396-1.263s1.925-.374 4.064-.374h7.546c1.85 0 3.047.111 3.59.333.598.243 1.084.662 1.455 1.254.37.593.557 1.217.557 1.87 0 1.03-.41 1.929-1.23 2.693-.588.543-1.546.815-2.875.815h-1.713v11.302c0 1.23-.21 2.182-.631 2.858-.71 1.13-1.735 1.696-3.075 1.696s-2.371-.516-3.092-1.546c-.455-.643-.681-1.617-.681-2.925V7.58zm22.172 8.709h3.4c1.404 0 2.449.288 3.134.864.808.687 1.212 1.574 1.212 2.66 0 1.108-.406 2.005-1.214 2.692-.632.532-1.668.798-3.108.798h-5.834c-1.374 0-2.316-.105-2.826-.316-.997-.41-1.657-1.08-1.978-2.011-.2-.598-.299-1.579-.299-2.942V5.702c0-1.031.034-1.723.1-2.078.121-.72.415-1.33.88-1.828.532-.566 1.209-.926 2.028-1.081.388-.066 1.175-.1 2.36-.1h4.472c1.218 0 1.928.011 2.127.034.798.077 1.451.31 1.961.697.909.688 1.363 1.585 1.363 2.693 0 1.197-.398 2.111-1.194 2.743-.708.565-1.674.848-2.902.848h-3.682v1.545h2.934c.86 0 1.574.227 2.138.682.596.487.895 1.157.895 2.01 0 1.807-1.1 2.71-3.3 2.71h-2.668v1.712zm24.064-1.729l1.762 2.826c.487.786.73 1.596.73 2.426 0 1.053-.363 1.926-1.088 2.618-.726.693-1.615 1.04-2.667 1.04-1.353 0-2.377-.577-3.075-1.73l-3.125-5.119v3.075c0 1.053-.347 1.945-1.04 2.676-.692.731-1.565 1.097-2.617 1.097-1.286 0-2.26-.46-2.925-1.38-.599-.808-.898-1.872-.898-3.191V4.92c0-2.87 1.546-4.305 4.638-4.305h4.753c1.563 0 3.014.452 4.355 1.355 1.34.903 2.32 2.075 2.942 3.516.465 1.085.698 2.176.698 3.273 0 2.05-.814 3.984-2.443 5.801z"/>

website/client/src/assets/images/home/make-use-of.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="32" viewBox="0 0 60 32">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 60 32">
     <path fill="#D5C8FF" fill-rule="evenodd" d="M2.516 0l2.59 3.082L0 32h57.191l-2.569-3.057L59.733 0H2.516zm42.095 3.117H56.052l-4.553 25.784H40.058l4.553-25.784zM33.657 23.938l3.675-20.821h4.164l-4.553 25.784H25.494l4.551-25.784h4.165l-3.675 20.821h3.122zM26.929 3.117l-4.552 25.784h-4.162L21.89 8.078h-3.117l-3.677 20.823h-4.17l3.678-20.823h-3.112L7.814 28.901H3.652L8.205 3.117h-.001 18.725zm20.965 4.96l-2.801 15.861h3.128l2.8-15.861h-3.127z"/>
 </svg>

website/client/src/assets/images/home/pixel-horizontal-2.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="180" viewBox="0 0 1440 180">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 1440 180">
     <path fill="#36205D" fill-rule="evenodd" d="M1440 90v90h-90V90h90zm-90 0v90h-90V90h90zm-90-90v90h-90V0h90zm-180 0v90h-90V0h90zm-90 90v90h-90V90h90zm-180 0v90h-90V90h90zm-90 0v90h-90V90h90zM630 0v90h-90V0h90zM360 90v90h-90V90h90zm180 0v90h-90V90h90zM180 0v90H90V0h90zM90 90v90H0V90h90z"/>
 </svg>

website/client/src/assets/images/home/pixel-horizontal-3.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="180" viewBox="0 0 1440 180">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 1440 180">
     <path fill="#271B3D" fill-rule="evenodd" d="M0 90h90v90H0V90zm90 0h90v90H90V90zm90-90h90v90h-90V0zm180 90h90v90h-90V90zm0-90h90v90h-90V0zm90 90h90v90h-90V90zm180 0h90v90h-90V90zm90 0h90v90h-90V90zm90-90h90v90h-90V0zm270 90h90v90h-90V90zm-180 0h90v90h-90V90zm360-90h90v90h-90V0zm90 90h90v90h-90V90z"/>
 </svg>

website/client/src/assets/images/home/pixel-horizontal.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="180" viewBox="0 0 1440 180">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 1440 180">
     <path fill-rule="evenodd" d="M1440 90h-90V0h90v90zm-270 0h-90V0h90v90zm90 90h-90V90h90v90zm-360 0h-90V90h90v90zm90-90h-90V0h90v90zm-180 0h-90V0h90v90zm-540 0h-90V0h90v90zm360 90h-90V90h90v90zM360 90h-90V0h90v90zm180 0h-90V0h90v90zm-360 90H90V90h90v90zM90 90H0V0h90v90z"/>
 </svg>

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

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="30" height="32" viewBox="0 0 30 32">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 30 32">
     <g fill="none" fill-rule="evenodd" stroke="#FFF" stroke-width="6">
         <path d="M27 15L15 27 3 15M23 3l-8 8-8-8"/>
     </g>

website/client/src/assets/members/message.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12" viewBox="0 0 16 12">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 12">
     <path fill="#4F2A93" fill-rule="evenodd" d="M14 10H2V2l6 5 6-5v8zm0-10H2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/>
 </svg>

website/client/src/assets/members/star.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" viewBox="0 0 17 16">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 17 16">
     <path fill="#878190" fill-rule="evenodd" d="M10.824 9.552l.604 3.553-3.16-1.677-3.157 1.677.604-3.553-2.58-2.537 3.563-.523 1.57-3.215 1.573 3.215 3.562.523-2.58 2.537zm4.859-4.225l-4.508-.66L9.168.56a1 1 0 0 0-1.797 0L5.364 4.666l-4.508.661A1 1 0 0 0 .3 7.03l3.268 3.216-.77 4.528a1 1 0 0 0 1.455 1.051l4.016-2.13 4.017 2.13a1 1 0 0 0 1.454-1.05l-.77-4.529L16.24 7.03a1 1 0 0 0-.556-1.702z"/>
 </svg>

website/client/src/assets/svg/10th-birthday-linear.svg

@@ -1,4 +1,4 @@
-<svg width="199" height="24" viewBox="0 0 199 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg  viewBox="0 0 199 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <g filter="url(#c19w6aye5a)" fill="#fff">
         <path d="M56.47 18.83V6.003L56 3.662l.47-1.405h8.942c1.773 0 3.193.344 4.26 1.03 1.066.687 1.6 1.733 1.6 3.137 0 .765-.142 1.397-.424 1.896a4.175 4.175 0 0 1-1.035 1.24 4.14 4.14 0 0 1 1.505.703c.471.327.855.772 1.154 1.334.297.546.447 1.225.447 2.036 0 1.639-.487 2.918-1.46 3.839-.956.905-2.502 1.358-4.635 1.358H56.471zm5.177-10.136h2.777c.533 0 .918-.078 1.153-.234.235-.171.353-.429.353-.772 0-.359-.173-.609-.518-.75-.345-.155-.753-.233-1.223-.233h-2.542v1.99zm0 5.688h4c.628 0 1.067-.093 1.318-.28a.974.974 0 0 0 .377-.796c0-.75-.486-1.124-1.46-1.124h-4.235v2.2zM75.515 18.83V6.003l-.236-2.341.236-1.405h5.2V18.83h-5.2zM84 18.83V6.026l-.471-2.364.47-1.405h8.472c1.27 0 2.36.203 3.27.61.91.405 1.608 1.06 2.095 1.965.486.89.73 2.068.73 3.535 0 1.357-.228 2.473-.683 3.347a4.552 4.552 0 0 1-2 1.99l.4.327 1.623 2.2 1.341 1.194v1.405h-6.235l-2.588-4.284h-1.248v.515l.236 2.34-.236 1.429H84zm5.176-8.66h1.365c.55 0 1.02-.024 1.412-.071.408-.047.722-.187.941-.421.22-.25.33-.648.33-1.194 0-.578-.118-.991-.353-1.24-.236-.25-.565-.399-.989-.446a9.614 9.614 0 0 0-1.435-.093h-1.506l.235 3.464zM104.666 18.83V6.728l-4.706.234V2.257h14.707v4.705l-4.824-.234v8.357l.259 2.34-.259 1.405h-5.177zM116.785 18.83V6.026l-.235-2.34.235-1.429h5.177v6.344h4.918V2.257h5.177v8.802l.235 1.615v6.156h-5.412v-5.946h-4.918v1.639l.235 4.307h-5.412zM135.588 18.83V6.026l-.471-2.34.471-1.429h7.977c1.114 0 2.188.11 3.223.328 1.051.203 1.985.593 2.801 1.17.831.578 1.49 1.405 1.976 2.482.486 1.076.73 2.473.73 4.19 0 1.716-.251 3.128-.753 4.236-.487 1.092-1.146 1.943-1.977 2.552a7.477 7.477 0 0 1-2.8 1.264 14.463 14.463 0 0 1-3.2.35h-7.977zm5.224-4.448h1.788c.926 0 1.702-.101 2.33-.304a2.498 2.498 0 0 0 1.458-1.147c.33-.577.495-1.412.495-2.504 0-1.108-.173-1.92-.518-2.435-.33-.53-.816-.874-1.459-1.03-.628-.171-1.396-.257-2.306-.257h-1.788v7.677zM153.013 18.83l1.13-3.956V11.9l1.741-.702 3.294-8.918h7.083l4.024 10.486 1.812 3.324v2.739h-5.106l-1.177-3.488h-6.377l-1.012 3.488h-5.412zm7.977-7.584h3.53l-1.553-4.658h-.494l-1.483 4.658zM176.04 18.83v-6.788l-5.835-8.38V2.257h5.906l2.353 4.822h.47l2.33-4.822h5.883v1.405l-6.001 8.52.141 2.364v4.284h-5.247zM191.923 12.72l-2.07-8.847L192.676 2l2.8 1.896-2.141 8.824h-1.412zm.518 7.28-3.059-3.043 3.059-3.043 3.059 3.043L192.441 20z"/>
     </g>
@@ -25,7 +25,7 @@
             <stop stop-color="#6133B4"/>
             <stop offset="1" stop-color="#4F2A93"/>
         </linearGradient>
-        <filter id="c19w6aye5a" x="53" y="0" width="145.5" height="24" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+        <filter id="c19w6aye5a" x="53" y="0"  filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
             <feFlood flood-opacity="0" result="BackgroundImageFix"/>
             <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
             <feOffset dy="1"/>
@@ -41,7 +41,7 @@
             <feBlend in2="effect1_dropShadow_45_799" result="effect2_dropShadow_45_799"/>
             <feBlend in="SourceGraphic" in2="effect2_dropShadow_45_799" result="shape"/>
         </filter>
-        <filter id="s1alkvv8kb" x="0" y="0" width="53" height="23.059" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+        <filter id="s1alkvv8kb" x="0" y="0"  filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
             <feFlood flood-opacity="0" result="BackgroundImageFix"/>
             <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
             <feOffset dy="1"/>

website/client/src/assets/svg/21-gems.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="55" viewBox="0 0 48 55">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  viewBox="0 0 48 55">
     <defs>
         <path id="a" d="M3.42.25H.24v11.463h3.18V.25z"/>
     </defs>

website/client/src/assets/svg/4-gems.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="50" height="53" viewBox="0 0 50 53">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  viewBox="0 0 50 53">
     <defs>
         <path id="a" d="M3.736.266H.261V12.89h3.475V.266z"/>
         <path id="c" d="M.36 20.706h21.324V.351H.36v20.355z"/>

website/client/src/assets/svg/42-gems.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="47" height="49" viewBox="0 0 47 49">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  viewBox="0 0 47 49">
     <defs>
         <path id="a" d="M3.36.059H.18v11.388H3.36V.059z"/>
         <path id="c" d="M0 .03v2.715h2.369V.03H0z"/>

website/client/src/assets/svg/84-gems.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65" height="64" viewBox="0 0 65 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  viewBox="0 0 65 64">
     <defs>
         <path id="a" d="M0 .11v9.836h8.584V.11H0z"/>
         <path id="c" d="M.169 6.905h10.056V.139H.169z"/>

website/client/src/assets/svg/apple-pay-logo.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="98" height="40" viewBox="0 0 98 40">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 98 40">
     <path fill="#000" fill-rule="nonzero" d="M17.744 5.137c-1.137 1.346-2.957 2.408-4.777 2.256-.228-1.82.663-3.753 1.706-4.948C15.81 1.062 17.801.075 19.413 0c.189 1.896-.55 3.754-1.669 5.137zm1.65 2.617c-2.636-.152-4.892 1.497-6.143 1.497-1.27 0-3.185-1.422-5.27-1.384-2.71.038-5.232 1.574-6.616 4.02C-1.48 16.776.625 24.018 3.375 28c1.345 1.972 2.957 4.133 5.08 4.057 2.01-.076 2.806-1.308 5.232-1.308 2.446 0 3.147 1.308 5.27 1.27 2.2-.038 3.583-1.972 4.93-3.943 1.535-2.237 2.16-4.417 2.198-4.531-.038-.038-4.246-1.65-4.284-6.502-.038-4.057 3.317-5.99 3.47-6.105-1.897-2.805-4.854-3.109-5.878-3.184zm15.222-5.498V31.81h4.588V21.706h6.35c5.801 0 9.877-3.98 9.877-9.744 0-5.763-4-9.706-9.725-9.706h-11.09zm4.588 3.867h5.289c3.98 0 6.256 2.123 6.256 5.858 0 3.735-2.275 5.877-6.275 5.877h-5.27V6.123zM63.81 32.038c2.882 0 5.555-1.46 6.768-3.773h.095v3.545h4.246V17.1c0-4.266-3.412-7.015-8.663-7.015-4.872 0-8.474 2.787-8.607 6.616h4.133c.341-1.82 2.028-3.014 4.341-3.014 2.806 0 4.38 1.308 4.38 3.716v1.63l-5.726.341c-5.327.323-8.208 2.503-8.208 6.294 0 3.83 2.976 6.37 7.241 6.37zm1.233-3.507c-2.446 0-4-1.176-4-2.976 0-1.858 1.497-2.939 4.36-3.11l5.1-.322v1.668c0 2.768-2.351 4.74-5.46 4.74zm15.545 11.317c4.474 0 6.578-1.706 8.417-6.881l8.057-22.597h-4.664l-5.403 17.46H86.9l-5.402-17.46H76.7l7.773 21.516-.417 1.308c-.702 2.218-1.839 3.071-3.867 3.071-.36 0-1.062-.038-1.346-.075v3.545c.265.075 1.402.113 1.744.113z"/>
 </svg>

website/client/src/assets/svg/apple.svg

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="170px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 170 170" version="1.1" height="170px">
+<svg >
  <path d="m150.37 130.25c-2.45 5.66-5.35 10.87-8.71 15.66-4.58 6.53-8.33 11.05-11.22 13.56-4.48 4.12-9.28 6.23-14.42 6.35-3.69 0-8.14-1.05-13.32-3.18-5.197-2.12-9.973-3.17-14.34-3.17-4.58 0-9.492 1.05-14.746 3.17-5.262 2.13-9.501 3.24-12.742 3.35-4.929 0.21-9.842-1.96-14.746-6.52-3.13-2.73-7.045-7.41-11.735-14.04-5.032-7.08-9.169-15.29-12.41-24.65-3.471-10.11-5.211-19.9-5.211-29.378 0-10.857 2.346-20.221 7.045-28.068 3.693-6.303 8.606-11.275 14.755-14.925s12.793-5.51 19.948-5.629c3.915 0 9.049 1.211 15.429 3.591 6.362 2.388 10.447 3.599 12.238 3.599 1.339 0 5.877-1.416 13.57-4.239 7.275-2.618 13.415-3.702 18.445-3.275 13.63 1.1 23.87 6.473 30.68 16.153-12.19 7.386-18.22 17.731-18.1 31.002 0.11 10.337 3.86 18.939 11.23 25.769 3.34 3.17 7.07 5.62 11.22 7.36-0.9 2.61-1.85 5.11-2.86 7.51zm-31.26-123.01c0 8.1021-2.96 15.667-8.86 22.669-7.12 8.324-15.732 13.134-25.071 12.375-0.119-0.972-0.188-1.995-0.188-3.07 0-7.778 3.386-16.102 9.399-22.908 3.002-3.446 6.82-6.3113 11.45-8.597 4.62-2.2516 8.99-3.4968 13.1-3.71 0.12 1.0831 0.17 2.1663 0.17 3.2409z" fill="#FFF"/>
 </svg>

website/client/src/assets/svg/apple_black.svg

@@ -1,3 +1,3 @@
-<svg width="13" height="16" viewBox="0 0 13 16" xmlns="http://www.w3.org/2000/svg">
+<svg  viewBox="0 0 13 16" xmlns="http://www.w3.org/2000/svg">
     <path d="M8.841 2.564c-.567.672-1.474 1.202-2.382 1.126-.113-.908.331-1.873.851-2.47C7.877.53 8.87.039 9.673 0c.095.946-.274 1.873-.832 2.564zm.823 1.306c-1.314-.076-2.439.747-3.063.747-.633 0-1.588-.71-2.627-.69-1.352.018-2.609.785-3.299 2.005-1.418 2.441-.369 6.055 1.002 8.042.67.984 1.474 2.063 2.533 2.025 1.002-.038 1.399-.653 2.609-.653 1.219 0 1.569.653 2.627.634 1.097-.019 1.787-.984 2.458-1.968.765-1.116 1.077-2.204 1.096-2.261-.019-.019-2.117-.823-2.136-3.245-.019-2.025 1.654-2.99 1.73-3.047-.946-1.4-2.42-1.551-2.93-1.59z" fill="#1A181D" fill-rule="nonzero"/>
 </svg>

website/client/src/assets/svg/arrow_left.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 32 32">
     <path fill="#A5A1AC" fill-rule="evenodd" d="M16 0h-4v32h4V0zm16 8H16v16h16V8zM12 4H8v24h4V4zM8 8H4v16h4V8zm-4 4H0v8h4v-8z"/>
 </svg>

website/client/src/assets/svg/arrow_right.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 32 32">
     <path fill="#A5A1AC" fill-rule="evenodd" d="M16 0h4v32h-4V0zM0 8h16v16H0V8zm20-4h4v24h-4V4zm4 4h4v16h-4V8zm4 4h4v8h-4v-8z"/>
 </svg>

website/client/src/assets/svg/big-gift.svg

@@ -1,4 +1,4 @@
-<svg width="176" height="67" viewBox="0 0 176 67" xmlns="http://www.w3.org/2000/svg">
+<svg  viewBox="0 0 176 67" xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd">
         <path fill="#77F4C7" d="M35.667 11.667 40 9.5l-4.333-2.167L33.5 3l-2.167 4.333L27 9.5l4.333 2.167L33.5 16z"/>
         <path fill="#BDA8FF" d="M24.667 38.667 30 36l-5.333-2.667L22 28l-2.667 5.333L14 36l5.333 2.667L22 44z"/>

website/client/src/assets/svg/birthday-gems.svg

@@ -1,4 +1,4 @@
-<svg width="58" height="48" viewBox="0 0 58 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg  viewBox="0 0 58 48" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path fill-rule="evenodd" clip-rule="evenodd" d="m16.853 4.36 7.959-1.453-2.71 7.556-2.708 7.557-5.25-6.103-5.25-6.103 7.959-1.453z" fill="#5DDEAB"/>
     <path fill-rule="evenodd" clip-rule="evenodd" d="M32.771 1.454 40.731 0l-2.71 7.556-2.709 7.556-5.25-6.102-5.25-6.103 7.96-1.453z" fill="#5DDEAB"/>
     <path fill-rule="evenodd" clip-rule="evenodd" d="m43.272 13.659-7.96 1.453 2.71-7.556L40.73 0l5.25 6.103 5.25 6.102-7.96 1.454z" fill="#38C38D"/>

website/client/src/assets/svg/block.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 16">
     <path fill-rule="evenodd" d="M8 14a5.96 5.96 0 0 1-3.327-1.011l8.316-8.316A5.96 5.96 0 0 1 14 8c0 3.309-2.691 6-6 6M8 2a5.96 5.96 0 0 1 3.327 1.011l-8.316 8.316A5.96 5.96 0 0 1 2 8c0-3.309 2.691-6 6-6m0-2a8 8 0 1 0 0 16A8 8 0 0 0 8 0"/>
 </svg>

website/client/src/assets/svg/bottom.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="11" viewBox="0 0 10 11">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 10 11">
     <g fill="none" fill-rule="evenodd" stroke="#686274" stroke-width="2">
         <path d="M5,0v8 M1,5l4,4l4-4"/>
     </g>

website/client/src/assets/svg/broken-megaphone.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="12" viewBox="0 0 14 12">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 14 12">
     <path fill-rule="evenodd" d="M2 7.05V3.954l4.873 2.872-4.291.715A.5.5 0 0 1 2 7.05zm8-1.108L3.83 2.306 10 3.334v2.608zm2.329-4.248l-.024-.004c-.007-.002-.012-.007-.02-.009-.017-.005-.035.001-.052-.003L2.329.028A2 2 0 0 0 0 2v5.64a2 2 0 0 0 2.329 1.972l7.056-1.176-.525 2.1a1.175 1.175 0 0 0 2.28.57l.772-3.09.417-.07A2 2 0 0 0 14 5.971V3.667a2 2 0 0 0-1.671-1.973z"/>
 </svg>

website/client/src/assets/svg/buff.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="12" viewBox="0 0 10 12">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 10 12">
     <path fill="#BDA8FF" fill-rule="evenodd" d="M5 0l5 6H7v2H3V6H0l5-6zM3 9h4v1H3V9zm0 2h4v1H3v-1z"/>
 </svg>

website/client/src/assets/svg/calendar-purple.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 24 24">
     <g fill="none" fill-rule="evenodd">
         <path fill="#9A62FF" d="M20.571 3.429V0h-3.428v3.429H6.857V0H3.43v3.429A3.428 3.428 0 0 0 0 6.857v13.714A3.428 3.428 0 0 0 3.429 24H20.57A3.428 3.428 0 0 0 24 20.571V6.857a3.428 3.428 0 0 0-3.429-3.428z"/>
         <path fill="#D5C8FF" d="M3.429 20.571H20.57V10.286H3.43z"/>

website/client/src/assets/svg/calendar.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 14 14">
     <path fill-rule="evenodd" d="M2 12h10V6H2v6zM12 2V0h-2v2H4V0H2v2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z"/>
 </svg>

website/client/src/assets/svg/challenge.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="12" viewBox="0 0 14 12">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 14 12">
     <path fill-rule="evenodd" d="M10 6.306L2.582 7.542A.5.5 0 0 1 2 7.05V2.591a.5.5 0 0 1 .582-.493L10 3.334v2.972zm2.329-4.612l-.024-.004c-.007-.002-.012-.007-.02-.009-.017-.005-.035.001-.052-.003L2.329.028A2 2 0 0 0 0 2v5.64a2 2 0 0 0 2.329 1.972l7.056-1.176-.525 2.1a1.175 1.175 0 0 0 2.28.57l.772-3.09.417-.07A2 2 0 0 0 14 5.971V3.667a2 2 0 0 0-1.671-1.973z"/>
 </svg>

website/client/src/assets/svg/check-red.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="10" viewBox="0 0 13 10">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 13 10">
     <path fill="#931F4D" fill-rule="evenodd" d="M4.662 9.832c-.312 0-.61-.123-.831-.344L0 5.657l1.662-1.662 2.934 2.934L10.534 0l1.785 1.529-6.764 7.893a1.182 1.182 0 0 1-.848.409l-.045.001"/>
 </svg>

website/client/src/assets/svg/check_circle.svg

@@ -1,4 +1,4 @@
-<svg width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+<svg  viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd">
         <circle fill="#1CA372" cx="32" cy="32" r="32"/>
         <path d="M27.277 46a3.34 3.34 0 0 1-2.367-.98L14 34.11l4.733-4.733 8.356 8.356L43.999 18l5.084 4.354L29.82 44.832a3.366 3.366 0 0 1-2.415 1.165c-.043.003-.086.003-.128.003" fill="#FFF"/>

website/client/src/assets/svg/checklist.svg

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

website/client/src/assets/svg/chevron-down.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="9" viewBox="0 0 14 9">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 14 9">
     <path fill="none" fill-rule="evenodd" stroke="#BDA8FF" stroke-width="2.5" d="M13 1L7 7 1 1"/>
 </svg>

website/client/src/assets/svg/chevron-red.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="10" viewBox="0 0 14 10">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 14 10">
     <path fill="none" fill-rule="evenodd" stroke="#DC4069" stroke-width="3" d="M13 1L7 7 1 1"/>
 </svg>

website/client/src/assets/svg/chevron.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="9" viewBox="0 0 14 9">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 14 9">
     <path fill="none" fill-rule="evenodd" stroke="#878190" stroke-width="2.5" d="M13 1L7 7 1 1"/>
 </svg>

website/client/src/assets/svg/clock-white.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 16">
     <g fill="none" fill-rule="evenodd">
         <path fill="#FFF" d="M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0m0 2c3.308 0 6 2.692 6 6s-2.692 6-6 6-6-2.692-6-6 2.692-6 6-6"/>
         <path stroke="#FFF" stroke-linecap="round" stroke-width="2" d="M8 5v3.031L10 10"/>

website/client/src/assets/svg/clock.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 16">
     <g fill="none" fill-rule="evenodd">
         <path fill="#D5C8FF" d="M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0m0 2c3.308 0 6 2.692 6 6s-2.692 6-6 6-6-2.692-6-6 2.692-6 6-6"/>
         <path stroke="#D5C8FF" stroke-linecap="round" stroke-width="2" d="M8 5v3.031L10 10"/>

website/client/src/assets/svg/close-teal.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 12 12">
     <g fill="none" fill-rule="evenodd" stroke="#8EEDF6" stroke-width="2">
         <path d="M1 11L11 1M11 11L1 1"/>
     </g>

website/client/src/assets/svg/close.svg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg  viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>Icon/Close</title>
     <g id="Modals" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Shop-Modals" transform="translate(-183.000000, -655.000000)" fill="#878190" fill-rule="nonzero">

website/client/src/assets/svg/cnet.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 40 40">
     <path  fill-rule="evenodd" d="M35.907 26.51v-1.424s-.771-.01-1.182-.006c-.522.006-.973-.241-1.01-.975l.004-7.688-.005-.014h1.852V15.01h-1.858l.011-.022v-2.982h-1.938v11.946c.06 1.035.386 1.964 1.246 2.35l-.003-.001c-.02-.01-.02-.008 0 0l.012.005c-.003 0-.006-.002-.009-.004.097.04.56.22 1.034.215.316-.008 1.846-.006 1.846-.006zm-5.688-2.527V22.61h-1.926v1.466c0 1.423-2.477 1.444-2.503 0v-3.053l4.07.002a.353.353 0 0 0 .352-.353v-3.14c.12-3.802-6.393-3.797-6.342-.094v6.545c-.05 3.703 6.468 3.797 6.349 0zm-6.953 1.103h-1.22v-7.748c-.062-1.038-.39-1.969-1.257-2.351.156.067-.92-.54-2.02.07-.868.48-1.2.971-1.2.971l-.007-1.041h-2.715v1.416l1.06.007v8.676l-.894-.003v1.425h2.816V17.25c.088-1.311 2.297-1.332 2.297-.002l.002 9.26h3.138v-1.422zm-10.813 6.858h1.393V9.236h-1.393v22.708zm-1.285-7.96V22.61H9.241v1.466c0 1.423-2.476 1.444-2.501 0v-6.638l-.003.07c.024-1.447 2.504-1.489 2.504-.07l.023 1.23h1.896v-1.136c.123-3.803-6.394-3.797-6.343-.094v6.545c-.05 3.703 6.468 3.797 6.351 0zm28.83-3.982c0 11.046-8.954 19.998-20 19.998S0 31.047 0 20.002C0 8.954 8.952 0 19.998 0c11.046 0 20 8.954 20 20.002zm-11.71-.423l-2.498.001v-2.152c.033-1.42 2.503-1.409 2.503.01l-.005 2.14z"/>
 </svg>

website/client/src/assets/svg/confetti.svg

@@ -1,4 +1,4 @@
-<svg width="518" height="152" viewBox="0 0 518 152" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg  viewBox="0 0 518 152" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M144.48 65.487v5.042h-1.772v-5.042h1.772zm1.621 6.671h5.013v1.782h-5.013v-1.782zm-10.027 0h5.013v1.782h-5.013v-1.782zm8.406 3.412v5.041h-1.772V75.57h1.772z" fill="#36205D" style="mix-blend-mode:multiply" opacity=".5"/>
     <path opacity=".92" fill-rule="evenodd" clip-rule="evenodd" d="m9.504 29.894 2.707-4.715 1.658.962-2.707 4.715-1.658-.962zm2.066-7.12-4.689-2.722.958-1.667 4.688 2.723-.957 1.667zm9.378 5.445-4.689-2.722.957-1.667 4.69 2.722-.958 1.667zm-6.03-7.755 2.707-4.715 1.658.962-2.707 4.715-1.658-.962z" fill="#fff"/>
     <path fill-rule="evenodd" clip-rule="evenodd" d="m60.85 11.508.708-3.662 1.288.251-.708 3.662-1.288-.252zm-.24-5.076-3.642-.712.25-1.295 3.642.712-.25 1.295zm7.283 1.423-3.642-.711.25-1.295 3.642.712-.25 1.294zm-5.627-3.671.708-3.662 1.287.251-.708 3.662-1.287-.251z" fill="#36205D" style="mix-blend-mode:multiply" opacity=".81"/>

website/client/src/assets/svg/copy.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 16">
     <path fill="#A5A1AC" fill-rule="evenodd" d="M6 14h8V4H6v10zm-4-2V2h4a2 2 0 0 0-2 2v8H2zM14 2h-2a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h2a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z"/>
 </svg>

website/client/src/assets/svg/credit-card-icon.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="16" viewBox="0 0 22 16">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 22 16">
     <path fill="#FFF" fill-rule="nonzero" d="M0 13.872V5.333h21.333v8.539c0 1.176-.747 2.128-1.67 2.128H1.67C.747 16 0 15.047 0 13.872zM19.664 0c.922 0 1.67.918 1.67 2.053v.614H0v-.614C0 .918.747 0 1.67 0h17.994z"/>
 </svg>

website/client/src/assets/svg/credit-card.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="158" height="52" viewBox="0 0 158 52">
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 158 52">
     <g fill="none" fill-rule="evenodd">
         <g fill="#A5A1AC">
             <path d="M79.337 48.628h-1.16l.898-2.216-1.787-4.509h1.226l1.122 3.069 1.132-3.069h1.226l-2.657 6.725zm-4.453-1.936c-.402 0-.815-.149-1.188-.44v.328h-1.197v-6.726h1.197v2.367c.373-.28.786-.43 1.188-.43 1.253 0 2.113 1.01 2.113 2.45 0 1.44-.86 2.451-2.113 2.451zm-.253-3.872c-.327 0-.655.14-.935.42v2.003c.28.28.608.42.935.42.674 0 1.141-.58 1.141-1.421 0-.842-.467-1.422-1.14-1.422zm-6.98 3.432c-.364.291-.775.44-1.187.44-1.244 0-2.114-1.01-2.114-2.45 0-1.441.87-2.45 2.114-2.45.412 0 .823.148 1.188.43v-2.368h1.207v6.726h-1.207v-.328zm0-3.011c-.27-.281-.598-.421-.925-.421-.683 0-1.15.58-1.15 1.422s.467 1.421 1.15 1.421c.327 0 .654-.14.926-.42V43.24zm-7.127 1.328c.074.711.636 1.197 1.42 1.197.432 0 .908-.159 1.395-.44v1.002a3.82 3.82 0 0 1-1.59.364c-1.413 0-2.404-1.029-2.404-2.488 0-1.412.972-2.413 2.31-2.413 1.226 0 2.058.964 2.058 2.338 0 .131 0 .28-.019.44h-3.17zm1.085-1.853c-.58 0-1.03.432-1.085 1.077h2.039c-.038-.637-.42-1.077-.954-1.077zm-4.238.74v3.124h-1.198v-4.677h1.198v.468c.337-.375.748-.58 1.15-.58.131 0 .262.009.393.046v1.067a1.573 1.573 0 0 0-.42-.056c-.394 0-.815.215-1.123.608zm-5.342 1.113c.075.711.636 1.197 1.422 1.197.43 0 .907-.159 1.393-.44v1.002a3.827 3.827 0 0 1-1.59.364c-1.412 0-2.403-1.029-2.403-2.488 0-1.412.972-2.413 2.31-2.413 1.225 0 2.058.964 2.058 2.338 0 .131 0 .28-.019.44h-3.17zm1.085-1.853c-.58 0-1.029.432-1.085 1.077h2.04c-.038-.637-.422-1.077-.955-1.077zm-5.267 3.864l-.955-3.18-.944 3.18h-1.076l-1.609-4.677h1.197l.945 3.18.945-3.18h1.085l.945 3.18.944-3.18h1.198l-1.6 4.677h-1.075zm-7.316.112c-1.413 0-2.414-1.02-2.414-2.45 0-1.441 1.001-2.45 2.414-2.45 1.412 0 2.404 1.009 2.404 2.45 0 1.43-.992 2.45-2.404 2.45zm0-3.9c-.702 0-1.188.59-1.188 1.45s.486 1.45 1.188 1.45c.692 0 1.178-.59 1.178-1.45s-.486-1.45-1.178-1.45zm-5.258 1.477h-1.076v2.311H33v-6.436h2.273c1.31 0 2.245.852 2.245 2.068 0 1.216-.935 2.057-2.245 2.057zm-.168-3.152h-.908v2.18h.908c.692 0 1.179-.44 1.179-1.085 0-.655-.487-1.095-1.18-1.095zM124.151 44.73h-4.941c.113 1.183.98 1.531 1.963 1.531 1.002 0 1.791-.211 2.48-.558v2.033c-.686.38-1.592.654-2.798.654-2.459 0-4.181-1.54-4.181-4.583 0-2.57 1.461-4.611 3.862-4.611 2.397 0 3.649 2.04 3.649 4.624 0 .245-.022.774-.034.91zm-3.631-3.477c-.631 0-1.332.477-1.332 1.614h2.61c0-1.136-.658-1.614-1.278-1.614zm-7.932 7.137c-.883 0-1.423-.372-1.785-.638l-.006 2.856-2.523.537-.001-11.781h2.222l.132.623a2.827 2.827 0 0 1 1.977-.791c1.772 0 3.441 1.596 3.441 4.535 0 3.207-1.651 4.66-3.457 4.66zM112 41.431c-.579 0-.942.212-1.205.5l.015 3.75c.245.267.598.48 1.19.48.933 0 1.56-1.016 1.56-2.375 0-1.32-.636-2.355-1.56-2.355zm-7.375-2.067h2.533v8.846h-2.533v-8.846zm0-2.825l2.533-.539v2.056l-2.533.539v-2.056zm-2.701 5.673v5.998H99.4v-8.846h2.182l.158.745c.591-1.086 1.771-.865 2.107-.745v2.32c-.32-.104-1.328-.255-1.924.528zm-5.41 2.895c0 1.487 1.593 1.024 1.915.895v2.054c-.336.185-.945.334-1.77.334-1.498 0-2.623-1.103-2.623-2.597l.012-8.097 2.464-.524.002 2.192h1.916v2.152h-1.916v3.59zm-3.146.43c0 1.817-1.446 2.853-3.545 2.853-.87 0-1.821-.169-2.76-.572v-2.41c.847.46 1.926.806 2.763.806.562 0 .968-.15.968-.618 0-1.204-3.837-.75-3.837-3.544 0-1.787 1.365-2.856 3.412-2.856.836 0 1.672.128 2.508.46v2.379c-.768-.415-1.743-.65-2.51-.65-.529 0-.858.153-.858.547 0 1.136 3.859.595 3.859 3.605z"/>