update gulp and dependencies

gulp/gulp-sprites.js

@@ -80,7 +80,7 @@ async function createSpritesStream (name, src) {
   const stream = mergeStream();
   // need to import this way bc of weird dependency things
   // eslint-disable-next-line global-require
-  const filter = require('gulp-filter');
+  const filter = require('gulp-filter').default;
 
   const f = filter(filterFile);
 

migrations/users/take-this.js

@@ -73,7 +73,7 @@ export default async function processUsers () {
       break;
     } else {
       query._id = {
-        $gt: users[users.length - 1]._id,
+        $gt: users[users.length - 1],
       };
     }
 

package.json

@@ -1,12 +1,13 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.43.2",
+  "version": "5.40.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.10",
     "@babel/preset-env": "^7.22.10",
     "@babel/register": "^7.22.15",
+    "@google-analytics/data": "^4.12.1",
     "@google-cloud/trace-agent": "^7.1.2",
     "@parse/node-apn": "^5.2.3",
     "@slack/webhook": "^6.1.0",
@@ -34,10 +35,9 @@
     "firebase-admin": "^12.1.1",
     "glob": "^8.1.0",
     "got": "^11.8.6",
-    "gulp": "^4.0.0",
+    "gulp": "5.0.1",
     "gulp-babel": "^8.0.0",
-    "gulp-filter": "^7.0.0",
-    "gulp-imagemin": "^7.1.0",
+    "gulp-filter": "^9.0.0",
     "gulp.spritesmith": "^6.13.0",
     "habitica-markdown": "^3.0.0",
     "helmet": "^4.6.0",
@@ -105,8 +105,8 @@
     "start": "node --watch ./website/server/index.js",
     "start:simple": "node ./website/server/index.js",
     "debug": "node --watch --inspect ./website/server/index.js",
-    "mongo:dev": "run-rs -v 7.0.23 -l ubuntu2214 --keep --dbpath mongodb-data --number 1 --quiet",
-    "mongo:test": "run-rs -v 7.0.23 -l ubuntu2214 --keep --dbpath mongodb-data-testing --number 1 --quiet",
+    "mongo:dev": "run-rs -v 7.0.23 -l ubuntu2204 --keep --dbpath mongodb-data --number 1 --quiet",
+    "mongo:test": "run-rs -v 7.0.23 -l ubuntu2204 --keep --dbpath mongodb-data-testing --number 1 --quiet",
     "postinstall": "git config --global url.\"https://\".insteadOf git:// && gulp build && cd website/client && npm install",
     "apidoc": "gulp apidoc",
     "heroku-postbuild": ".heroku/report_deploy.sh"

test/api/unit/libs/email.test.js

@@ -150,7 +150,7 @@ describe('emails', () => {
 
       sendTxn(mailingInfo, emailType);
       expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
+      expect(got.post).to.be.calledWith('undefined/job', sinon.match({
         json: {
           data: {
             emailType: sinon.match.same(emailType),
@@ -234,7 +234,7 @@ describe('emails', () => {
 
       sendTxn(mailingInfo, emailType);
       expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
+      expect(got.post).to.be.calledWith('undefined/job', sinon.match({
         json: {
           data: {
             emailType: sinon.match.same(emailType),
@@ -254,7 +254,7 @@ describe('emails', () => {
 
       sendTxn(mailingInfo, emailType, variables);
       expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
+      expect(got.post).to.be.calledWith('undefined/job', sinon.match({
         json: {
           data: {
             variables: sinon.match(value => value[0].name === 'BASE_URL', 'matches variables'),

test/api/unit/libs/highlightMentions.test.js

@@ -47,12 +47,6 @@ describe('highlightMentions', () => {
     expect(result[0]).to.equal('[@user-dash](/profile/444): message [@user_underscore](/profile/555)');
   });
 
-  it('highlights users with case-insensitive matching', async () => {
-    const text = '@USER: message @User2 @USER3';
-    const result = await highlightMentions(text);
-    expect(result[0]).to.equal('[@USER](/profile/111): message [@User2](/profile/222) [@USER3](/profile/333)');
-  });
-
   it('doesn\'t highlight nonexisting users', async () => {
     const text = '@nouser message';
     const result = await highlightMentions(text);

test/api/unit/libs/payments/apple.test.js

@@ -12,33 +12,11 @@ const { i18n } = common;
 describe('Apple Payments', () => {
   const subKey = 'basic_3mo';
 
-  let iapSetupStub;
-  let iapValidateStub;
-  let iapIsValidatedStub;
-  let iapIsCanceledStub;
-  let iapIsExpiredStub;
-  let paymentBuySkuStub;
-  let iapGetPurchaseDataStub;
-  let validateGiftMessageStub;
-  let paymentsCreateSubscritionStub;
-
-  beforeEach(() => {
-    iapSetupStub = sinon.stub(iap, 'setup').resolves();
-    iapValidateStub = sinon.stub(iap, 'validate').resolves({});
-  });
-
-  afterEach(() => {
-    iap.setup.restore();
-    iap.validate.restore();
-    iap.isValidated.restore();
-    iap.isExpired.restore();
-    iap.isCanceled.restore();
-    iap.getPurchaseData.restore();
-  });
-
   describe('verifyPurchase', () => {
     let sku; let user; let token; let receipt; let
       headers;
+    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let paymentBuySkuStub; let
+      iapGetPurchaseDataStub; let validateGiftMessageStub;
 
     beforeEach(() => {
       token = 'testToken';
@@ -47,9 +25,13 @@ describe('Apple Payments', () => {
       receipt = `{"token": "${token}", "productId": "${sku}"}`;
       headers = {};
 
+      iapSetupStub = sinon.stub(iap, 'setup')
+        .resolves();
+      iapValidateStub = sinon.stub(iap, 'validate')
+        .resolves({});
       iapIsValidatedStub = sinon.stub(iap, 'isValidated').returns(true);
-      iapIsCanceledStub = sinon.stub(iap, 'isCanceled').returns(false);
-      iapIsExpiredStub = sinon.stub(iap, 'isExpired').returns(false);
+      sinon.stub(iap, 'isExpired').returns(false);
+      sinon.stub(iap, 'isCanceled').returns(false);
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
         .returns([{
           productId: 'com.habitrpg.ios.Habitica.21gems',
@@ -60,6 +42,12 @@ describe('Apple Payments', () => {
     });
 
     afterEach(() => {
+      iap.setup.restore();
+      iap.validate.restore();
+      iap.isValidated.restore();
+      iap.isExpired.restore();
+      iap.isCanceled.restore();
+      iap.getPurchaseData.restore();
       payments.buySkuItem.restore();
       gems.validateGiftMessage.restore();
     });
@@ -221,6 +209,9 @@ describe('Apple Payments', () => {
   describe('subscribe', () => {
     let sub; let sku; let user; let token; let receipt; let headers; let
       nextPaymentProcessing;
+    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub;
+    let paymentsCreateSubscritionStub; let
+      iapGetPurchaseDataStub;
 
     beforeEach(() => {
       sub = common.content.subscriptionBlocks[subKey];
@@ -232,10 +223,12 @@ describe('Apple Payments', () => {
       nextPaymentProcessing = moment.utc().add({ days: 2 });
       user = new User();
 
+      iapSetupStub = sinon.stub(iap, 'setup')
+        .resolves();
+      iapValidateStub = sinon.stub(iap, 'validate')
+        .resolves({});
       iapIsValidatedStub = sinon.stub(iap, 'isValidated')
         .returns(true);
-      iapIsCanceledStub = sinon.stub(iap, 'isCanceled').returns(false);
-      iapIsExpiredStub = sinon.stub(iap, 'isExpired').returns(false);
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
         .returns([{
           expirationDate: moment.utc().subtract({ day: 1 }).toDate(),
@@ -257,6 +250,10 @@ describe('Apple Payments', () => {
     });
 
     afterEach(() => {
+      iap.setup.restore();
+      iap.validate.restore();
+      iap.isValidated.restore();
+      iap.getPurchaseData.restore();
       if (payments.createSubscription.restore) payments.createSubscription.restore();
     });
 
@@ -273,29 +270,6 @@ describe('Apple Payments', () => {
         });
     });
 
-    it('should throw an error if no active subscription is found', async () => {
-      iap.isCanceled.restore();
-      iapIsCanceledStub = sinon.stub(iap, 'isCanceled')
-        .returns(true);
-
-      iap.getPurchaseData.restore();
-      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
-        .returns([{
-          expirationDate: moment.utc().add({ day: -2 }).toDate(),
-          purchaseDate: new Date(),
-          productId: 'subscription1month',
-          transactionId: token,
-          originalTransactionId: token,
-        }]);
-
-      await expect(applePayments.subscribe(user, receipt, headers, nextPaymentProcessing))
-        .to.eventually.be.rejected.and.to.eql({
-          httpCode: 401,
-          name: 'NotAuthorized',
-          message: applePayments.constants.RESPONSE_NO_ITEM_PURCHASED,
-        });
-    });
-
     const subOptions = [
       {
         sku: 'subscription1month',
@@ -600,7 +574,8 @@ describe('Apple Payments', () => {
   describe('cancelSubscribe ', () => {
     let user; let token; let receipt; let headers; let customerId; let
       expirationDate;
-    let paymentCancelSubscriptionSpy;
+    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let iapGetPurchaseDataStub; let
+      paymentCancelSubscriptionSpy;
 
     beforeEach(async () => {
       token = 'test-token';
@@ -609,7 +584,8 @@ describe('Apple Payments', () => {
       customerId = 'test-customerId';
       expirationDate = moment.utc();
 
-      iapValidateStub.restore();
+      iapSetupStub = sinon.stub(iap, 'setup')
+        .resolves();
       iapValidateStub = sinon.stub(iap, 'validate')
         .resolves({
           expirationDate,
@@ -617,8 +593,8 @@ describe('Apple Payments', () => {
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
         .returns([{ expirationDate: expirationDate.toDate() }]);
       iapIsValidatedStub = sinon.stub(iap, 'isValidated').returns(true);
-      iapIsCanceledStub = sinon.stub(iap, 'isCanceled').returns(false);
-      iapIsExpiredStub = sinon.stub(iap, 'isExpired').returns(true);
+      sinon.stub(iap, 'isCanceled').returns(false);
+      sinon.stub(iap, 'isExpired').returns(true);
       user = new User();
       user.profile.name = 'sender';
       user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
@@ -630,7 +606,13 @@ describe('Apple Payments', () => {
     });
 
     afterEach(() => {
-      paymentCancelSubscriptionSpy.restore();
+      iap.setup.restore();
+      iap.validate.restore();
+      iap.isValidated.restore();
+      iap.isExpired.restore();
+      iap.isCanceled.restore();
+      iap.getPurchaseData.restore();
+      payments.cancelSubscription.restore();
     });
 
     it('should throw an error if we are missing a subscription', async () => {
@@ -713,8 +695,6 @@ describe('Apple Payments', () => {
       expect(iapIsValidatedStub).to.be.calledWith({
         expirationDate,
       });
-      expect(iapIsCanceledStub).to.be.calledOnce;
-      expect(iapIsExpiredStub).to.be.calledOnce;
       expect(iapGetPurchaseDataStub).to.be.calledOnce;
 
       expect(paymentCancelSubscriptionSpy).to.be.calledOnce;

test/api/unit/libs/payments/google.test.js

@@ -11,36 +11,12 @@ const { i18n } = common;
 
 describe('Google Payments', () => {
   const subKey = 'basic_3mo';
-  let iapSetupStub;
-  let iapValidateStub;
-  let iapIsValidatedStub;
-  let paymentBuySkuStub;
-  let validateGiftMessageStub;
-
-  beforeEach(() => {
-    iapSetupStub = sinon.stub(iap, 'setup')
-      .resolves();
-    iapIsValidatedStub = sinon.stub(iap, 'isValidated')
-      .returns(true);
-    sinon.stub(iap, 'isCanceled').returns(false);
-    sinon.stub(iap, 'isExpired').returns(false);
-    paymentBuySkuStub = sinon.stub(payments, 'buySkuItem').resolves({});
-    validateGiftMessageStub = sinon.stub(gems, 'validateGiftMessage');
-  });
-
-  afterEach(() => {
-    iap.setup.restore();
-    iap.validate.restore();
-    iap.isValidated.restore();
-    iap.isCanceled.restore();
-    iap.isExpired.restore();
-    payments.buySkuItem.restore();
-    gems.validateGiftMessage.restore();
-  });
 
   describe('verifyPurchase', () => {
     let sku; let user; let token; let receipt; let signature; let
       headers;
+    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let
+      paymentBuySkuStub; let validateGiftMessageStub;
 
     beforeEach(() => {
       sku = 'com.habitrpg.android.habitica.iap.21gems';
@@ -49,7 +25,21 @@ describe('Google Payments', () => {
       signature = '';
       headers = {};
 
+      iapSetupStub = sinon.stub(iap, 'setup')
+        .resolves();
       iapValidateStub = sinon.stub(iap, 'validate').resolves({ productId: sku });
+      iapIsValidatedStub = sinon.stub(iap, 'isValidated')
+        .returns(true);
+      paymentBuySkuStub = sinon.stub(payments, 'buySkuItem').resolves({});
+      validateGiftMessageStub = sinon.stub(gems, 'validateGiftMessage');
+    });
+
+    afterEach(() => {
+      iap.setup.restore();
+      iap.validate.restore();
+      iap.isValidated.restore();
+      payments.buySkuItem.restore();
+      gems.validateGiftMessage.restore();
     });
 
     it('should throw an error if receipt is invalid', async () => {
@@ -170,7 +160,8 @@ describe('Google Payments', () => {
   describe('subscribe', () => {
     let sub; let sku; let user; let token; let receipt; let signature; let headers; let
       nextPaymentProcessing;
-    let paymentsCreateSubscritionStub;
+    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let
+      paymentsCreateSubscritionStub;
 
     beforeEach(() => {
       sub = common.content.subscriptionBlocks[subKey];
@@ -182,12 +173,19 @@ describe('Google Payments', () => {
       signature = '';
       nextPaymentProcessing = moment.utc().add({ days: 2 });
 
+      iapSetupStub = sinon.stub(iap, 'setup')
+        .resolves();
       iapValidateStub = sinon.stub(iap, 'validate')
         .resolves({});
+      iapIsValidatedStub = sinon.stub(iap, 'isValidated')
+        .returns(true);
       paymentsCreateSubscritionStub = sinon.stub(payments, 'createSubscription').resolves({});
     });
 
     afterEach(() => {
+      iap.setup.restore();
+      iap.validate.restore();
+      iap.isValidated.restore();
       payments.createSubscription.restore();
     });
 
@@ -245,7 +243,7 @@ describe('Google Payments', () => {
   describe('cancelSubscribe ', () => {
     let user; let token; let receipt; let signature; let headers; let customerId; let
       expirationDate;
-    let iapGetPurchaseDataStub; let
+    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let iapGetPurchaseDataStub; let
       paymentCancelSubscriptionSpy;
 
     beforeEach(async () => {
@@ -255,12 +253,17 @@ describe('Google Payments', () => {
       signature = '';
       customerId = 'test-customerId';
       expirationDate = moment.utc();
+
+      iapSetupStub = sinon.stub(iap, 'setup')
+        .resolves();
       iapValidateStub = sinon.stub(iap, 'validate')
         .resolves({
           expirationDate,
         });
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
         .returns([{ expirationDate: expirationDate.toDate(), autoRenewing: false }]);
+      iapIsValidatedStub = sinon.stub(iap, 'isValidated')
+        .returns(true);
 
       user = new User();
       user.profile.name = 'sender';
@@ -273,6 +276,9 @@ describe('Google Payments', () => {
     });
 
     afterEach(() => {
+      iap.setup.restore();
+      iap.validate.restore();
+      iap.isValidated.restore();
       iap.getPurchaseData.restore();
       payments.cancelSubscription.restore();
     });
@@ -302,8 +308,6 @@ describe('Google Payments', () => {
     });
 
     it('should cancel a user subscription', async () => {
-      iap.isCanceled.restore();
-      iap.isCanceled = sinon.stub(iap, 'isCanceled').returns(true);
       await googlePayments.cancelSubscribe(user, headers);
 
       expect(iapSetupStub).to.be.calledOnce;
@@ -328,20 +332,11 @@ describe('Google Payments', () => {
     });
 
     it('should cancel a user subscription with multiple inactive subscriptions', async () => {
-      iap.isCanceled.restore();
-      iap.isCanceled = sinon.stub(iap, 'isCanceled').returns(true);
       const laterDate = moment.utc().add(7, 'days');
       iap.getPurchaseData.restore();
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
-        .returns([{
-          startTimeMillis: expirationDate.valueOf(),
-          expirationDate,
-          autoRenewing: false,
-        }, {
-          startTimeMillis: laterDate.valueOf(),
-          expirationDate: laterDate,
-          autoRenewing: false,
-        },
+        .returns([{ expirationDate, autoRenewing: false },
+          { expirationDate: laterDate, autoRenewing: false },
         ]);
       await googlePayments.cancelSubscribe(user, headers);
 
@@ -370,12 +365,7 @@ describe('Google Payments', () => {
       iap.getPurchaseData.restore();
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
         .returns([{ autoRenewing: true }]);
-      await expect(googlePayments.cancelSubscribe(user, headers))
-        .to.eventually.be.rejected.and.to.eql({
-          httpCode: 401,
-          name: 'NotAuthorized',
-          message: googlePayments.constants.RESPONSE_STILL_VALID,
-        });
+      await googlePayments.cancelSubscribe(user, headers);
 
       expect(iapSetupStub).to.be.calledOnce;
       expect(iapValidateStub).to.be.calledOnce;
@@ -398,12 +388,8 @@ describe('Google Payments', () => {
         .returns([{ expirationDate, autoRenewing: false },
           { autoRenewing: true },
           { expirationDate, autoRenewing: false }]);
-      await expect(googlePayments.cancelSubscribe(user, headers))
-        .to.eventually.be.rejected.and.to.eql({
-          httpCode: 401,
-          name: 'NotAuthorized',
-          message: googlePayments.constants.RESPONSE_STILL_VALID,
-        });
+      await googlePayments.cancelSubscribe(user, headers);
+
       expect(iapSetupStub).to.be.calledOnce;
       expect(iapValidateStub).to.be.calledOnce;
       expect(iapValidateStub).to.be.calledWith(iap.GOOGLE, {

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

@@ -9,7 +9,7 @@ import {
 import {
   SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
 } from '../../../../../website/server/models/group';
-import { MAX_MESSAGE_LENGTH, CHAT_FLAG_FROM_SHADOW_MUTE } from '../../../../../website/common/script/constants';
+import { MAX_MESSAGE_LENGTH } from '../../../../../website/common/script/constants';
 import * as email from '../../../../../website/server/libs/email';
 
 describe('POST /chat', () => {
@@ -80,20 +80,17 @@ describe('POST /chat', () => {
       member.updateOne({ 'flags.chatRevoked': false });
     });
 
-    it('errors when chat privileges are revoked when sending a message to a private guild', async () => {
+    it('does not error when chat privileges are revoked when sending a message to a private guild', async () => {
       await member.updateOne({
         'flags.chatRevoked': true,
       });
 
-      await expect(member.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage }))
-        .to.eventually.be.rejected.and.eql({
-          code: 401,
-          error: 'NotAuthorized',
-          message: t('chatPrivilegesRevoked'),
-        });
+      const message = await member.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
+
+      expect(message.message.id).to.exist;
     });
 
-    it('errors when chat privileges are revoked when sending a message to a party', async () => {
+    it('does not error when chat privileges are revoked when sending a message to a party', async () => {
       const { group, members } = await createAndPopulateGroup({
         groupDetails: {
           name: 'Party',
@@ -109,12 +106,9 @@ describe('POST /chat', () => {
         'auth.timestamps.created': new Date('2022-01-01'),
       });
 
-      await expect(privatePartyMemberWithChatsRevoked.post(`/groups/${group._id}/chat`, { message: testMessage }))
-        .to.eventually.be.rejected.and.eql({
-          code: 401,
-          error: 'NotAuthorized',
-          message: t('chatPrivilegesRevoked'),
-        });
+      const message = await privatePartyMemberWithChatsRevoked.post(`/groups/${group._id}/chat`, { message: testMessage });
+
+      expect(message.message.id).to.exist;
     });
   });
 
@@ -129,7 +123,7 @@ describe('POST /chat', () => {
       member.updateOne({ 'flags.chatShadowMuted': false });
     });
 
-    it('creates a chat with flagCount set when sending a message to a private guild', async () => {
+    it('creates a chat with zero flagCount when sending a message to a private guild', async () => {
       await member.updateOne({
         'flags.chatShadowMuted': true,
       });
@@ -137,10 +131,10 @@ describe('POST /chat', () => {
       const message = await member.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
 
       expect(message.message.id).to.exist;
-      expect(message.message.flagCount).to.eql(CHAT_FLAG_FROM_SHADOW_MUTE);
+      expect(message.message.flagCount).to.eql(0);
     });
 
-    it('creates a chat with flagCount set when sending a message to a party', async () => {
+    it('creates a chat with zero flagCount when sending a message to a party', async () => {
       const { group, members } = await createAndPopulateGroup({
         groupDetails: {
           name: 'Party',
@@ -159,7 +153,7 @@ describe('POST /chat', () => {
       const message = await userWithChatShadowMuted.post(`/groups/${group._id}/chat`, { message: testMessage });
 
       expect(message.message.id).to.exist;
-      expect(message.message.flagCount).to.eql(CHAT_FLAG_FROM_SHADOW_MUTE);
+      expect(message.message.flagCount).to.eql(0);
     });
   });
 
@@ -244,18 +238,6 @@ describe('POST /chat', () => {
     expect(groupMessages[0].id).to.exist;
   });
 
-  it('creates a chat with case-insensitive mentions', async () => {
-    const originalUsername = member.auth.local.username;
-    const uppercaseUsername = originalUsername.toUpperCase();
-    const messageWithMentions = `hi @${uppercaseUsername}`;
-    const newMessage = await user.post(`/groups/${groupWithChat._id}/chat`, { message: messageWithMentions });
-    const groupMessages = await user.get(`/groups/${groupWithChat._id}/chat`);
-
-    expect(newMessage.message.id).to.exist;
-    expect(newMessage.message.text).to.include(`[@${uppercaseUsername}](/profile/${member._id})`);
-    expect(groupMessages[0].id).to.exist;
-  });
-
   it('creates a chat with a max length of 3000 chars', async () => {
     const veryLongMessage = `
     123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789.

test/api/v3/integration/groups/POST-groups_invite.test.js

@@ -61,24 +61,6 @@ describe('Post /groups/:groupId/invite', () => {
         });
     });
 
-    it('fakes sending an invite if user is shadow muted', async () => {
-      const inviterMuted = await inviter.updateOne({ 'flags.chatShadowMuted': true });
-      const userToInvite = await generateUser();
-
-      const response = await inviterMuted.post(`/groups/${group._id}/invite`, {
-        usernames: [userToInvite.auth.local.lowerCaseUsername],
-      });
-      expect(response).to.be.an('Array');
-      expect(response[0]).to.have.all.keys(['_id', 'id', 'name', 'inviter']);
-      expect(response[0]._id).to.be.a('String');
-      expect(response[0].id).to.eql(group._id);
-      expect(response[0].name).to.eql(groupName);
-      expect(response[0].inviter).to.eql(inviter._id);
-
-      await expect(userToInvite.get('/user'))
-        .to.eventually.not.have.nested.property('invitations.parties[0].id', group._id);
-    });
-
     it('invites a user to a group by username', async () => {
       const userToInvite = await generateUser();
 
@@ -227,24 +209,6 @@ describe('Post /groups/:groupId/invite', () => {
         });
     });
 
-    it('fakes sending an invite if user is shadow muted', async () => {
-      const inviterMuted = await inviter.updateOne({ 'flags.chatShadowMuted': true });
-      const userToInvite = await generateUser();
-
-      const response = await inviterMuted.post(`/groups/${group._id}/invite`, {
-        uuids: [userToInvite._id],
-      });
-      expect(response).to.be.an('Array');
-      expect(response[0]).to.have.all.keys(['_id', 'id', 'name', 'inviter']);
-      expect(response[0]._id).to.be.a('String');
-      expect(response[0].id).to.eql(group._id);
-      expect(response[0].name).to.eql(groupName);
-      expect(response[0].inviter).to.eql(inviter._id);
-
-      await expect(userToInvite.get('/user'))
-        .to.eventually.not.have.nested.property('invitations.parties[0].id', group._id);
-    });
-
     it('invites a user to a group by uuid', async () => {
       const userToInvite = await generateUser();
 
@@ -317,19 +281,6 @@ describe('Post /groups/:groupId/invite', () => {
         });
     });
 
-    it('fakes sending invite when inviter is shadow muted', async () => {
-      const inviterMuted = await inviter.updateOne({ 'flags.chatShadowMuted': true });
-      const res = await inviterMuted.post(`/groups/${group._id}/invite`, {
-        emails: [testInvite],
-        inviter: 'inviter name',
-      });
-
-      const updatedUser = await inviterMuted.sync();
-
-      expect(res).to.exist;
-      expect(updatedUser.invitesSent).to.eql(1);
-    });
-
     it('returns an error when invite is missing an email', async () => {
       await expect(inviter.post(`/groups/${group._id}/invite`, {
         emails: [{ name: 'test' }],
@@ -454,19 +405,6 @@ describe('Post /groups/:groupId/invite', () => {
         });
     });
 
-    it('fakes sending an invite if user is shadow muted', async () => {
-      const inviterMuted = await inviter.updateOne({ 'flags.chatShadowMuted': true });
-      const newUser = await generateUser();
-      const invite = await inviterMuted.post(`/groups/${group._id}/invite`, {
-        uuids: [newUser._id],
-        emails: [{ name: 'test', email: 'test@habitica.com' }],
-      });
-      const invitedUser = await newUser.get('/user');
-
-      expect(invitedUser.invitations.parties[0]).to.not.exist;
-      expect(invite).to.exist;
-    });
-
     it('invites users to a group by uuid and email', async () => {
       const newUser = await generateUser();
       const invite = await inviter.post(`/groups/${group._id}/invite`, {

test/api/v3/integration/inbox/POST-send_private_message.test.js

@@ -43,7 +43,7 @@ describe('POST /members/send-private-message', () => {
     });
   });
 
-  it('returns error when recipient has blocked the sender', async () => {
+  it('returns error when to user has blocked the sender', async () => {
     const receiver = await generateUser({ 'inbox.blocks': [userToSendMessage._id] });
 
     await expect(userToSendMessage.post('/members/send-private-message', {
@@ -56,7 +56,7 @@ describe('POST /members/send-private-message', () => {
     });
   });
 
-  it('returns error when sender has blocked recipient', async () => {
+  it('returns error when sender has blocked to user', async () => {
     const receiver = await generateUser();
     const sender = await generateUser({ 'inbox.blocks': [receiver._id] });
 
@@ -70,7 +70,7 @@ describe('POST /members/send-private-message', () => {
     });
   });
 
-  it('returns error when recipient has opted out of messaging', async () => {
+  it('returns error when to user has opted out of messaging', async () => {
     const receiver = await generateUser({ 'inbox.optOut': true });
 
     await expect(userToSendMessage.post('/members/send-private-message', {
@@ -174,7 +174,7 @@ describe('POST /members/send-private-message', () => {
     expect(notification.data.excerpt).to.equal(messageExcerpt);
   });
 
-  it('allows admin to send when recipient has blocked the admin', async () => {
+  it('allows admin to send when sender has blocked the admin', async () => {
     userToSendMessage = await generateUser({
       'permissions.moderator': true,
     });
@@ -202,7 +202,7 @@ describe('POST /members/send-private-message', () => {
     expect(sendersMessageInSendersInbox).to.exist;
   });
 
-  it('allows admin to send when recipient has opted out of messaging', async () => {
+  it('allows admin to send when to user has opted out of messaging', async () => {
     userToSendMessage = await generateUser({
       'permissions.moderator': true,
     });
@@ -229,58 +229,4 @@ describe('POST /members/send-private-message', () => {
     expect(sendersMessageInReceiversInbox).to.exist;
     expect(sendersMessageInSendersInbox).to.exist;
   });
-
-  describe('sender is shadow muted', () => {
-    beforeEach(async () => {
-      userToSendMessage = await generateUser({
-        'flags.chatShadowMuted': true,
-      });
-    });
-
-    it('does not save the message in the receiver inbox', async () => {
-      const receiver = await generateUser();
-
-      const response = await userToSendMessage.post('/members/send-private-message', {
-        message: messageToSend,
-        toUserId: receiver._id,
-      });
-
-      expect(response.message.uuid).to.equal(receiver._id);
-
-      const updatedReceiver = await receiver.get('/user');
-      const updatedSender = await userToSendMessage.get('/user');
-
-      const sendersMessageInReceiversInbox = _.find(
-        updatedReceiver.inbox.messages,
-        message => message.uuid === userToSendMessage._id && message.text === messageToSend,
-      );
-
-      const sendersMessageInSendersInbox = _.find(
-        updatedSender.inbox.messages,
-        message => message.uuid === receiver._id && message.text === messageToSend,
-      );
-
-      expect(sendersMessageInReceiversInbox).to.not.exist;
-      expect(sendersMessageInSendersInbox).to.exist;
-    });
-
-    it('does not save the message message twice if recipient is sender', async () => {
-      const response = await userToSendMessage.post('/members/send-private-message', {
-        message: messageToSend,
-        toUserId: userToSendMessage._id,
-      });
-
-      expect(response.message.uuid).to.equal(userToSendMessage._id);
-
-      const updatedSender = await userToSendMessage.get('/user');
-
-      const sendersMessageInSendersInbox = _.find(
-        updatedSender.inbox.messages,
-        message => message.uuid === userToSendMessage._id && message.text === messageToSend,
-      );
-
-      expect(sendersMessageInSendersInbox).to.exist;
-      expect(Object.keys(updatedSender.inbox.messages).length).to.equal(1);
-    });
-  });
 });

test/api/v3/integration/user/auth/POST-login-local.test.js

@@ -44,7 +44,7 @@ describe('POST /user/auth/local/login', () => {
     })).to.eventually.be.rejected.and.eql({
       code: 401,
       error: 'NotAuthorized',
-      message: t('accountSuspended', { communityManagerEmail: nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL'), userId: user._id, username: user.auth.local.username }),
+      message: t('accountSuspended', { communityManagerEmail: nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL'), userId: user._id }),
     });
   });
 

website/client/package-lock.json

@@ -23,6 +23,7 @@
         "eslint-config-habitrpg": "6.2.0",
         "eslint-plugin-mocha": "5.3.0",
         "eslint-plugin-vue": "7.20.0",
+        "ga-gtag": "^1.2.0",
         "habitica-markdown": "^3.0.0",
         "hellojs": "^1.20.0",
         "intro.js": "^7.2.0",
@@ -37,7 +38,7 @@
         "timers-browserify": "^2.0.12",
         "uuid": "^9.0.1",
         "validator": "^13.9.0",
-        "vite": "^6.3.6",
+        "vite": "^6.0.0",
         "vite-plugin-compression2": "^1.3.3",
         "vue": "^2.7.10",
         "vue-fragment": "^1.6.0",
@@ -5122,20 +5123,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -5174,6 +5161,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/ga-gtag": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ga-gtag/-/ga-gtag-1.2.0.tgz",
+      "integrity": "sha512-j9gxutMdpGMdwaX1SzOG31Ddm+IGFjeNf+N3Z5g+BBpS8FSXOALlrM+ORIGc/QKszGJEDlw+6PfIsJZICsqsGQ=="
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -7134,21 +7126,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/playwright/node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/popper.js": {
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
@@ -8551,10 +8528,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
-      "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
-      "license": "MIT",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.4",

website/client/package.json

@@ -27,6 +27,7 @@
     "eslint-config-habitrpg": "6.2.0",
     "eslint-plugin-mocha": "5.3.0",
     "eslint-plugin-vue": "7.20.0",
+    "ga-gtag": "^1.2.0",
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.20.0",
     "intro.js": "^7.2.0",
@@ -41,7 +42,7 @@
     "timers-browserify": "^2.0.12",
     "uuid": "^9.0.1",
     "validator": "^13.9.0",
-    "vite": "^6.3.6",
+    "vite": "^6.0.0",
     "vite-plugin-compression2": "^1.3.3",
     "vue": "^2.7.10",
     "vue-fragment": "^1.6.0",

website/client/src/app.vue

@@ -203,9 +203,6 @@ export default {
 
       return response;
     }, error => { // Set up Error interceptors
-      if (!error.response) {
-        return Promise.reject(error);
-      }
       if (error.response.status >= 400) {
         const isBanned = this.checkForBannedUser(error);
         if (isBanned === true) return null; // eslint-disable-line consistent-return

website/client/src/assets/css/sprites/spritesmith-main.css

@@ -1055,11 +1055,6 @@
   width: 141px;
   height: 147px;
 }
-.background_elegant_palace {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_elegant_palace.png');
-  width: 141px;
-  height: 147px;
-}
 .background_enchanted_music_room {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_enchanted_music_room.png');
   width: 141px;
@@ -1756,11 +1751,6 @@
   width: 141px;
   height: 147px;
 }
-.background_nighttime_street_with_shops {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_nighttime_street_with_shops.png');
-  width: 141px;
-  height: 147px;
-}
 .background_ocean_sunrise {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_ocean_sunrise.png');
   width: 141px;
@@ -2447,11 +2437,6 @@
   width: 141px;
   height: 147px;
 }
-.background_winter_desert_with_saguaros {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_winter_desert_with_saguaros.png');
-  width: 141px;
-  height: 147px;
-}
 .background_winter_fireworks {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_winter_fireworks.png');
   width: 141px;
@@ -29470,11 +29455,6 @@
   width: 60px;
   height: 60px;
 }
-.back_armoire_harpsichord {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_armoire_harpsichord.png');
-  width: 114px;
-  height: 90px;
-}
 .body_armoire_clownsBowtie {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/body_armoire_clownsBowtie.png');
   width: 114px;
@@ -29865,11 +29845,6 @@
   width: 114px;
   height: 90px;
 }
-.broad_armor_armoire_loneCowpokeOutfit {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_loneCowpokeOutfit.png');
-  width: 114px;
-  height: 90px;
-}
 .broad_armor_armoire_lunarArmor {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_lunarArmor.png');
   width: 90px;
@@ -30505,11 +30480,6 @@
   width: 114px;
   height: 87px;
 }
-.head_armoire_loneCowpokeHat {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_loneCowpokeHat.png');
-  width: 114px;
-  height: 90px;
-}
 .head_armoire_lunarCrown {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_lunarCrown.png');
   width: 90px;
@@ -30820,11 +30790,6 @@
   width: 114px;
   height: 90px;
 }
-.shield_armoire_doubleBass {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_doubleBass.png');
-  width: 114px;
-  height: 90px;
-}
 .shield_armoire_dragonTamerShield {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_dragonTamerShield.png');
   width: 90px;
@@ -31030,11 +30995,6 @@
   width: 90px;
   height: 90px;
 }
-.shield_armoire_prettyPinkGiftBox {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_prettyPinkGiftBox.png');
-  width: 114px;
-  height: 90px;
-}
 .shield_armoire_ramHornShield {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_ramHornShield.png');
   width: 90px;
@@ -31505,11 +31465,6 @@
   width: 114px;
   height: 90px;
 }
-.slim_armor_armoire_loneCowpokeOutfit {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_loneCowpokeOutfit.png');
-  width: 114px;
-  height: 90px;
-}
 .slim_armor_armoire_lunarArmor {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_lunarArmor.png');
   width: 90px;
@@ -31805,11 +31760,6 @@
   width: 114px;
   height: 90px;
 }
-.weapon_armoire_bambooFlute {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_bambooFlute.png');
-  width: 114px;
-  height: 90px;
-}
 .weapon_armoire_barristerGavel {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_barristerGavel.png');
   width: 90px;
@@ -32220,11 +32170,6 @@
   width: 114px;
   height: 90px;
 }
-.weapon_armoire_prettyPinkParasol {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_prettyPinkParasol.png');
-  width: 114px;
-  height: 90px;
-}
 .weapon_armoire_pushBroom {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_pushBroom.png');
   width: 114px;
@@ -34115,46 +34060,6 @@
   width: 90px;
   height: 90px;
 }
-.back_mystery_202601 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202601.png');
-  width: 114px;
-  height: 90px;
-}
-.back_mystery_202602 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202602.png');
-  width: 114px;
-  height: 90px;
-}
-.broad_armor_mystery_202512 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202512.png');
-  width: 114px;
-  height: 90px;
-}
-.head_mystery_202512 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202512.png');
-  width: 114px;
-  height: 90px;
-}
-.head_mystery_202602 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202602.png');
-  width: 114px;
-  height: 90px;
-}
-.slim_armor_mystery_202512 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202512.png');
-  width: 114px;
-  height: 90px;
-}
-.weapon_mystery_202512 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202512.png');
-  width: 114px;
-  height: 90px;
-}
-.weapon_mystery_202601 {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202601.png');
-  width: 114px;
-  height: 90px;
-}
 .back_mystery_201402 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_201402.png');
   width: 90px;
@@ -38735,26 +38640,6 @@
   width: 114px;
   height: 90px;
 }
-.broad_armor_special_winter2026Healer {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_winter2026Healer.png');
-  width: 114px;
-  height: 90px;
-}
-.broad_armor_special_winter2026Mage {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_winter2026Mage.png');
-  width: 114px;
-  height: 90px;
-}
-.broad_armor_special_winter2026Rogue {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_winter2026Rogue.png');
-  width: 117px;
-  height: 120px;
-}
-.broad_armor_special_winter2026Warrior {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_winter2026Warrior.png');
-  width: 114px;
-  height: 90px;
-}
 .broad_armor_special_yeti {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_yeti.png');
   width: 90px;
@@ -39050,26 +38935,6 @@
   width: 114px;
   height: 90px;
 }
-.head_special_winter2026Healer {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_winter2026Healer.png');
-  width: 114px;
-  height: 90px;
-}
-.head_special_winter2026Mage {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_winter2026Mage.png');
-  width: 114px;
-  height: 90px;
-}
-.head_special_winter2026Rogue {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_winter2026Rogue.png');
-  width: 117px;
-  height: 120px;
-}
-.head_special_winter2026Warrior {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_winter2026Warrior.png');
-  width: 114px;
-  height: 90px;
-}
 .head_special_yeti {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_yeti.png');
   width: 90px;
@@ -39250,21 +39115,6 @@
   width: 114px;
   height: 90px;
 }
-.shield_special_winter2026Healer {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_winter2026Healer.png');
-  width: 114px;
-  height: 90px;
-}
-.shield_special_winter2026Rogue {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_winter2026Rogue.png');
-  width: 117px;
-  height: 120px;
-}
-.shield_special_winter2026Warrior {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_winter2026Warrior.png');
-  width: 114px;
-  height: 90px;
-}
 .shield_special_yeti {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_yeti.png');
   width: 90px;
@@ -39505,26 +39355,6 @@
   width: 114px;
   height: 90px;
 }
-.slim_armor_special_winter2026Healer {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_winter2026Healer.png');
-  width: 114px;
-  height: 90px;
-}
-.slim_armor_special_winter2026Mage {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_winter2026Mage.png');
-  width: 114px;
-  height: 90px;
-}
-.slim_armor_special_winter2026Rogue {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_winter2026Rogue.png');
-  width: 117px;
-  height: 120px;
-}
-.slim_armor_special_winter2026Warrior {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_winter2026Warrior.png');
-  width: 114px;
-  height: 90px;
-}
 .slim_armor_special_yeti {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_yeti.png');
   width: 90px;
@@ -39765,26 +39595,6 @@
   width: 114px;
   height: 90px;
 }
-.weapon_special_winter2026Healer {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_winter2026Healer.png');
-  width: 114px;
-  height: 90px;
-}
-.weapon_special_winter2026Mage {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_winter2026Mage.png');
-  width: 114px;
-  height: 90px;
-}
-.weapon_special_winter2026Rogue {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_winter2026Rogue.png');
-  width: 117px;
-  height: 120px;
-}
-.weapon_special_winter2026Warrior {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_winter2026Warrior.png');
-  width: 114px;
-  height: 90px;
-}
 .weapon_special_yeti {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_yeti.png');
   width: 90px;

website/client/src/assets/images/gifts_bg.svg

@@ -1,9 +0,0 @@
-<svg width="378" height="176" viewBox="0 0 378 176" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 0H378V174C378 175.105 377.105 176 376 176H1.99999C0.895423 176 0 175.105 0 174V0Z" fill="url(#paint0_linear_2257_239)"/>
-<defs>
-<linearGradient id="paint0_linear_2257_239" x1="378" y1="0" x2="0" y2="0" gradientUnits="userSpaceOnUse">
-<stop stop-color="#925CF3"/>
-<stop offset="1" stop-color="#34B5C1"/>
-</linearGradient>
-</defs>
-</svg>

website/client/src/assets/images/gifts_start.svg

@@ -1,37 +0,0 @@
-<svg width="48" height="96" viewBox="0 0 48 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.10104 12.0483C-2.82088 9.43721 -3.53422 6.57214 -5.6115 5.24584C-7.68877 3.91954 -9.89543 4.92709 -10.1422 6.808C-10.3891 8.68891 -9.06061 9.83066 -4.97737 13.9337C-3.81821 15.0985 -3.3812 14.6594 -3.10104 12.0483Z" stroke="#FFA624" stroke-width="4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.34089 15.2054C4.45116 13.6561 7.27707 12.8443 9.45877 13.9889C11.6405 15.1334 11.8754 17.5575 10.3778 18.7127C8.88016 19.868 7.23193 19.2828 1.65411 17.781C0.0706697 17.3546 0.230624 16.7548 2.34089 15.2054Z" stroke="#FFBE5D" stroke-width="4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.549002 12.0098C-3.61871 9.59194 -3.87667 15.8322 -2.20457 16.8023C-0.532473 17.7724 4.71671 14.4277 0.549002 12.0098Z" fill="#EE9109"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-1.76917 16.0445L13.637 24.9825L9.18965 32.7229L-6.21656 23.785L-1.76917 16.0445Z" fill="#F8F9F9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-6.90457 13.0652L3.36623 19.0238L-1.08116 26.7643L-11.352 20.8057L-6.90457 13.0652Z" fill="#FFBE5D"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-1.76917 16.0445L3.36623 19.0238L1.88377 21.604L-3.25163 18.6247L-1.76917 16.0445Z" fill="#FFA624"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-6.21656 23.785L6.62195 31.2333L-3.75529 49.2944L-16.5938 41.8461L-6.21656 23.785Z" fill="#F8F9F9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.64886 25.2747L6.62195 31.2333L5.13948 33.8134L-5.13132 27.8548L-3.64886 25.2747Z" fill="#DDF3F3"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.401307 24.1842L10.6721 30.1428L9.18965 32.7229L-1.08116 26.7643L0.401307 24.1842Z" fill="#DDF3F3"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7924 38.4607L17.9387 42.0519L21.31 40.5834L24.8838 41.4413L23.4225 38.0537L24.2762 34.4625L20.9049 35.9309L17.3311 35.0731L18.7924 38.4607Z" fill="white" fill-opacity="0.5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.93867 71.2331L-4.79238 74.8243L-1.42111 73.3559L2.15271 74.2137L0.691383 70.8261L1.54509 67.2349L-1.82618 68.7033L-5.4 67.8455L-3.93867 71.2331Z" fill="white" fill-opacity="0.5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M33.8949 25.3807L35.0583 29.8802L37.9424 26.2452L42.4202 25.0761L38.8028 22.178L37.6393 17.6786L34.7552 21.3135L30.2775 22.4826L33.8949 25.3807Z" fill="white" fill-opacity="0.5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.2596 71.999L40.579 68.1435L45.9507 88.2881L31.6312 92.1436L26.2596 71.999Z" fill="#F8F9F9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9401 75.8545L26.2589 71.9966L31.6273 92.1421L17.3084 96L11.9401 75.8545Z" fill="#DDF3F3"/>
-<rect width="2.96589" height="20.8485" transform="matrix(0.965611 -0.25999 0.257652 0.966238 23.3957 72.7701)" fill="#FFA624"/>
-<rect width="2.96589" height="20.8485" transform="matrix(0.965611 -0.25999 0.257652 0.966238 26.2596 71.999)" fill="#FFBE5D"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.9999 90.0369L30.8638 89.2658L31.6312 92.1436L28.7673 92.9147L27.9999 90.0369Z" fill="#EE9109"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.3957 72.7701L26.2596 71.999L27.0269 74.8768L24.163 75.6479L23.3957 72.7701Z" fill="#EE9109"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9401 75.8545L23.3951 72.7682L24.162 75.6461L12.707 78.7325L11.9401 75.8545Z" fill="#C1E9E9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5443 93.1213L27.9999 90.0369L28.7673 92.9147L17.3117 95.9991L16.5443 93.1213Z" fill="#C1E9E9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.1235 71.2279L40.579 68.1435L41.3464 71.0213L29.8908 74.1057L29.1235 71.2279Z" fill="#DDF3F3"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M33.7277 88.4947L45.1833 85.4103L45.9507 88.2881L34.4951 91.3725L33.7277 88.4947Z" fill="#DDF3F3"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M30.8638 89.2658L33.7277 88.4947L34.4951 91.3725L31.6312 92.1436L30.8638 89.2658Z" fill="#FFA624"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.2596 71.999L29.1235 71.2279L29.8908 74.1057L27.0269 74.8768L26.2596 71.999Z" fill="#FFA624"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5224 56.3076C25.8087 53.7812 24.0792 51.3933 21.6588 50.9455C19.2383 50.4977 17.5679 52.2625 18.0403 54.0994C18.5126 55.9363 20.17 56.4948 25.4855 58.7621C26.9945 59.4057 27.236 58.834 26.5224 56.3076Z" stroke="#FFA624" stroke-width="4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.745 57.1864C34.124 54.9555 36.4415 53.1391 38.8911 53.3791C41.3406 53.6191 42.4621 55.7782 41.5042 57.413C40.5463 59.0479 38.7999 59.1258 33.0684 59.8329C31.4413 60.0337 31.366 59.4173 32.745 57.1864Z" stroke="#FFBE5D" stroke-width="4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8923 54.898C25.1267 54.225 27.2139 60.108 29.1258 60.378C31.0378 60.648 34.6579 55.571 29.8923 54.898Z" fill="#EE9109"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.247 59.5115L46.8635 61.9994L45.6255 70.8503L28.0091 68.3625L29.247 59.5115Z" fill="#F8F9F9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6306 57.0236L29.247 59.5114L28.0091 68.3624L10.3927 65.8745L11.6306 57.0236Z" fill="#DDF3F3"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.3749 58.6822L35.1192 60.3408L33.8813 69.1917L22.137 67.5332L23.3749 58.6822Z" fill="#FFBE5D"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.3749 58.6822L29.247 59.5115L28.0091 68.3625L22.137 67.5332L23.3749 58.6822Z" fill="#FFA624"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.247 59.5115L35.1192 60.3408L34.7065 63.2911L28.8344 62.4618L29.247 59.5115Z" fill="#FFA624"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.3749 58.6822L29.247 59.5115L28.8344 62.4618L22.9622 61.6326L23.3749 58.6822Z" fill="#EE9109"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.8053 62.9241L22.5496 64.5827L22.137 67.533L10.3927 65.8745L10.8053 62.9241Z" fill="#C1E9E9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.2939 66.2414L46.0382 67.9L45.6255 70.8503L33.8813 69.1917L34.2939 66.2414Z" fill="#DDF3F3"/>
-</svg>

website/client/src/assets/scss/button.scss

@@ -30,23 +30,12 @@
     cursor: default;
     color: $gray-200;
     opacity: 1;
-    background-color: transparent;
+    box-shadow: none;
+    background-color: $gray-700;
     border: 2px solid transparent;
-    box-shadow:
-      0 1px 3px 0 rgba($black, 0.12),
-      0 1px 2px 0 rgba($black, 0.24);
-    font-family: 'Roboto', sans-serif;
-    font-weight: 700;
-    font-size: 14px;
-    line-height: 24px;
-    padding: 4px 12px;
-    min-height: 32px;
-    max-height: 32px;
-    gap: 8px;
-    border-radius: 4px;
-    
+
     .svg {
-      color: $gray-200;
+      color: $gray-300;
     }
   }
 

website/client/src/assets/scss/typography.scss

@@ -123,10 +123,6 @@ h4 {
   background-color: $purple-300 !important;
 }
 
-.bg-yellow-50 {
-  background-color: $yellow-50 !important;
-}
-
 .bg-white {
   background-color: $white !important;
 }

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g fill="#FFFFFF" fill-rule="nonzero">
-            <polygon points="12.1973467 2 14 3.80265326 9.80187117 8 14 12.1973467 12.1973467 14 8 9.80187117 3.80265326 14 2 12.1973467 6.19812883 8 2 3.80265326 3.80265326 2 8 6.19812883"></polygon>
-        </g>
-    </g>
-</svg>

website/client/src/assets/svg/for-css/orange100_red100_yellow100_gems.svg

@@ -1,29 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M58.1792 31.6843L46.8536 22.3769L23.918 28.6988L18.861 42.5218L44.341 58.5813L58.1792 31.6843Z" fill="#FF944C"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M46.6218 34.5148L46.1108 26.1328L36.2812 28.8422L46.6218 34.5148Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M30.2393 39.0304L26.4518 31.5515L36.2813 28.8422L30.2393 39.0304Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M46.6218 34.5148L36.2813 28.8422L30.2393 39.0304L46.6218 34.5148Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M53.8301 32.5279L46.1108 26.1328L46.6218 34.5148L53.8301 32.5279Z" fill="white"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M23.0309 41.0173L26.4518 31.5516L30.2393 39.0304L23.0309 41.0173Z" fill="#FA8537"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M53.8301 32.5279L46.6218 34.5148L43.0424 53.79L53.8301 32.5279Z" fill="#FA8537"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M23.0309 41.0173L30.2393 39.0304L43.0425 53.79L23.0309 41.0173Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M46.6218 34.5148L30.2393 39.0304L43.0425 53.79L46.6218 34.5148Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M50.555 4.15937L47.026 0.420004L38.7773 1.59601L36.4144 6.17539L44.5675 12.8919L50.555 4.15937Z" fill="#FFBE5D"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M46.414 4.62854L46.6034 1.6924L43.0682 2.1964L46.414 4.62854Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M40.5221 5.46854L39.5331 2.7004L43.0682 2.1964L40.5221 5.46854Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M46.414 4.62854L43.0683 2.1964L40.5221 5.46855L46.414 4.62854Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M49.0064 4.25894L46.6034 1.6924L46.414 4.62854L49.0064 4.25894Z" fill="white"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M37.9296 5.83815L39.5331 2.70041L40.5221 5.46855L37.9296 5.83815Z" fill="#FFA624"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M49.0064 4.25893L46.414 4.62853L44.3259 11.1688L49.0064 4.25893Z" fill="#FFA624"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M37.9297 5.83815L40.5221 5.46855L44.326 11.1688L37.9297 5.83815Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M46.414 4.62854L40.5221 5.46855L44.326 11.1688L46.414 4.62854Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2986 16.7775L24.6513 8.36623L11.1016 3.94533L4.07056 9.19883L11.614 25.6769L27.2986 16.7775Z" fill="#FF6165"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M20.5864 14.3719L23.0573 10.0026L17.2502 8.10789L20.5864 14.3719Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M10.908 11.2141L11.4432 6.21322L17.2502 8.10789L10.908 11.2141Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M20.5864 14.3719L17.2502 8.10789L10.9081 11.2141L20.5864 14.3719Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M24.8449 15.7613L23.0573 10.0026L20.5864 14.3719L24.8449 15.7613Z" fill="white"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M6.64955 9.82464L11.4432 6.21321L10.908 11.2141L6.64955 9.82464Z" fill="#F23035"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M24.8449 15.7613L20.5864 14.3719L12.5221 22.8464L24.8449 15.7613Z" fill="#F23035"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6.64959 9.82464L10.9081 11.2141L12.5221 22.8463L6.64959 9.82464Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M20.5864 14.3719L10.9081 11.2141L12.5221 22.8463L20.5864 14.3719Z" fill="white"/>
-</svg>

website/client/src/assets/svg/for-css/purple200_green10_blue100_gems.svg

@@ -1,29 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.82083 31.6843L17.1464 22.3769L40.082 28.6988L45.139 42.5218L19.659 58.5813L5.82083 31.6843Z" fill="#24CC8F"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M17.3782 34.5148L17.8892 26.1328L27.7188 28.8422L17.3782 34.5148Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M33.7607 39.0304L37.5482 31.5515L27.7187 28.8422L33.7607 39.0304Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M17.3782 34.5148L27.7187 28.8422L33.7607 39.0304L17.3782 34.5148Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M10.1699 32.5279L17.8892 26.1328L17.3782 34.5148L10.1699 32.5279Z" fill="white"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M40.9691 41.0173L37.5482 31.5516L33.7607 39.0304L40.9691 41.0173Z" fill="#1CA372"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M10.1699 32.5279L17.3782 34.5148L20.9576 53.79L10.1699 32.5279Z" fill="#1CA372"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M40.9691 41.0173L33.7607 39.0304L20.9575 53.79L40.9691 41.0173Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M17.3782 34.5148L33.7607 39.0304L20.9575 53.79L17.3782 34.5148Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.445 4.15937L16.974 0.420004L25.2227 1.59601L27.5856 6.17539L19.4325 12.8919L13.445 4.15937Z" fill="#925CF3"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M17.586 4.62854L17.3966 1.6924L20.9318 2.1964L17.586 4.62854Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M23.4779 5.46854L24.4669 2.7004L20.9318 2.1964L23.4779 5.46854Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M17.586 4.62854L20.9317 2.1964L23.4779 5.46855L17.586 4.62854Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14.9936 4.25894L17.3966 1.6924L17.586 4.62854L14.9936 4.25894Z" fill="white"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M26.0704 5.83815L24.4669 2.70041L23.4779 5.46855L26.0704 5.83815Z" fill="#4F2A93"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M14.9936 4.25893L17.586 4.62853L19.6741 11.1688L14.9936 4.25893Z" fill="#4F2A93"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M26.0703 5.83815L23.4779 5.46855L19.674 11.1688L26.0703 5.83815Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M17.586 4.62854L23.4779 5.46855L19.674 11.1688L17.586 4.62854Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.7014 16.7775L39.3487 8.36623L52.8984 3.94533L59.9294 9.19883L52.386 25.6769L36.7014 16.7775Z" fill="#50B5E9"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M43.4136 14.3719L40.9427 10.0026L46.7498 8.10789L43.4136 14.3719Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M53.092 11.2141L52.5568 6.21322L46.7498 8.10789L53.092 11.2141Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M43.4136 14.3719L46.7498 8.10789L53.0919 11.2141L43.4136 14.3719Z" fill="white"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M39.1551 15.7613L40.9427 10.0026L43.4136 14.3719L39.1551 15.7613Z" fill="white"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M57.3504 9.82464L52.5568 6.21321L53.092 11.2141L57.3504 9.82464Z" fill="#46A7D9"/>
-<path opacity="0.35" fill-rule="evenodd" clip-rule="evenodd" d="M39.1551 15.7613L43.4136 14.3719L51.4779 22.8464L39.1551 15.7613Z" fill="#46A7D9"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M57.3504 9.82464L53.0919 11.2141L51.4779 22.8463L57.3504 9.82464Z" fill="white"/>
-<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M43.4136 14.3719L53.0919 11.2141L51.4779 22.8463L43.4136 14.3719Z" fill="white"/>
-</svg>

website/client/src/components/achievements/onboardingComplete.vue

@@ -117,7 +117,7 @@ export default {
     closeWithAction () {
       this.close();
       setTimeout(() => {
-        this.$router.push(`/profile/${this.$store.state.user.data._id}#achievements`);
+        this.$router.push({ name: 'achievements' });
       }, 200);
     },
   },

website/client/src/components/admin/admin-panel/search.vue

@@ -81,7 +81,7 @@ export default {
   watch: {
     userIdentifier () {
       this.isSearching = true;
-      this.$store.dispatch('admin:searchUsers', { userIdentifier: this.userIdentifier }).then(users => {
+      this.$store.dispatch('adminPanel:searchUsers', { userIdentifier: this.userIdentifier }).then(users => {
         this.isSearching = false;
         if (users.length === 1) {
           this.loadUser(users[0]._id);

website/client/src/components/admin/admin-panel/user-support/index.vue

@@ -5,12 +5,6 @@
       class="row"
     >
       <div class="form col-12">
-        <button
-          class="btn btn-danger mt-3 float-right"
-          @click="confirmDeleteHero"
-        >
-          Begin Member deletion
-        </button>
         <basic-details
           :user-id="hero._id"
           :auth="hero.auth"
@@ -102,53 +96,6 @@
           :reset-counter="resetCounter"
           @clear-data="clearData"
         />
-        <b-modal
-          id="delete-member-modal"
-          title="Delete Member"
-          ok-title="Delete"
-          ok-variant="danger"
-          cancel-title="Cancel"
-          @ok="deleteHero"
-        >
-          <b-modal-body>
-            <p>
-              Are you sure you want to delete this member?
-            </p>
-            <p class="errorMessage">
-              Please note: This action cannot be undone!
-            </p>
-            <div class="ml-4">
-              <div class="form-check">
-                <input
-                  id="deleteAccountCheck"
-                  v-model="deleteHabiticaAccount"
-                  class="form-check-input"
-                  type="checkbox"
-                >
-                <label
-                  class="form-check-label"
-                  for="deleteAccountCheck"
-                >
-                  Delete Habitica account
-                </label>
-              </div>
-              <div class="form-check">
-                <input
-                  id="deleteAmplitudeCheck"
-                  v-model="deleteAmplitudeData"
-                  class="form-check-input"
-                  type="checkbox"
-                >
-                <label
-                  class="form-check-label"
-                  for="deleteAmplitudeCheck"
-                >
-                  Delete Amplitude data
-                </label>
-              </div>
-            </div>
-          </b-modal-body>
-        </b-modal>
       </div>
     </div>
   </div>
@@ -237,8 +184,6 @@ export default {
       hasParty: false,
       partyNotExistError: false,
       adminHasPrivForParty: true,
-      deleteHabiticaAccount: true,
-      deleteAmplitudeData: true,
     };
   },
   watch: {
@@ -304,25 +249,6 @@ export default {
 
       this.resetCounter += 1; // tell child components to reinstantiate from scratch
     },
-    confirmDeleteHero () {
-      if (this.hero._id === this.user._id) {
-        window.alert('You cannot delete your own account.');
-        return;
-      }
-      this.$root.$emit('bv::show::modal', 'delete-member-modal');
-    },
-    deleteHero () {
-      this.$store.dispatch('hall:deleteHero', {
-        uuid: this.hero._id,
-        deleteHabiticaAccount: this.deleteHabiticaAccount,
-        deleteAmplitudeData: this.deleteAmplitudeData,
-      }).then(() => {
-        this.$root.$emit('bv::hide::modal', 'delete-member-modal');
-        this.$router.push({ name: 'adminPanel' });
-      }).catch(err => {
-        window.alert(err);
-      });
-    },
     hasUnsavedChanges (...comparisons) {
       for (const index in comparisons) {
         if (index && comparisons[index]) {

website/client/src/components/admin/admin-panel/user-support/partyAndQuest.vue

@@ -37,11 +37,7 @@
             Party ID
           </label>
           <strong class="col-sm-9 col-form-label">
-            <router-link
-              :to="{'name': 'groupAdminGroup', 'params': {'groupId': groupPartyData._id}}"
-            >
-              {{ groupPartyData._id }}
-            </router-link>
+            {{ groupPartyData._id }}
           </strong>
         </div>
         <div class="form-group row">

website/client/src/components/admin/admin-panel/user-support/subscriptionAndPerks.vue

@@ -15,25 +15,6 @@
           :class="{ 'open': expand }"
         >
           Subscription, Monthly Perks
-          <span
-            v-if="isSubscribed() && !isCancelled()"
-            class="text-success float-right ml-3"
-          >
-            Active
-          </span>
-          <span
-            v-else-if="isSubscribed() && isCancelled()"
-            class="text-success float-right ml-3"
-          >
-            Active until {{ dateFormat(hero.purchased.plan.dateTerminated) }}
-          </span>
-          <span
-            v-else-if="hero.purchased.plan.customerId && hero.purchased.plan.dateTerminated"
-            class="text-warning float-right ml-3"
-          >
-            Inactive
-          </span>
-
           <b
             v-if="hasUnsavedChanges && !expand"
             class="text-warning float-right"
@@ -65,7 +46,7 @@
               class="form-control"
               type="text"
             >
-              <option value="Group Plan">
+              <option value="groupPlan">
                 Group Plan
               </option>
               <option value="Stripe">
@@ -173,11 +154,7 @@
             >
               <div class="card-body">
                 <h6 class="card-title">
-                  <router-link
-                    :to="{ name: 'groupAdminGroup', params: { groupId: group._id } }"
-                  >
-                    {{ group.name }}
-                  </router-link>
+                  {{ group.name }}
                   <small class="float-right">{{ group._id }}</small>
                 </h6>
                 <p class="card-text">
@@ -268,7 +245,8 @@
               </div>
             </div>
             <small
-              v-if="isSubscribed() && !isCancelled()"
+              v-if="!hero.purchased.plan.dateTerminated
+                && hero.purchased.plan.planId"
               class="text-success"
             >
               The subscription does not have a termination date and is active.
@@ -441,79 +419,6 @@
             >
           </div>
         </div>
-
-        <div class="form-group row">
-          <h2>Payment Details</h2>
-        </div>
-        <div class="form-group row">
-          <div class="offset-sm-3 col-sm-9 mb-3">
-            <button
-              type="button"
-              class="btn btn-secondary btn-sm"
-              @click="getSubscriptionPaymentDetails"
-            >
-              Get Subscription Payment Details
-            </button>
-          </div>
-        </div>
-        <div
-          v-if="paymentDetails"
-        >
-          <div
-            v-for="(value, key) in paymentDetails"
-            :key="key"
-            class="form-group row"
-          >
-            <label class="col-sm-3 col-form-label">
-              {{ getHumanReadablePaymentDetails(key).label }}:
-              <span
-                :id="`${key}_tooltip`"
-                v-b-tooltip.hover.right="getHumanReadablePaymentDetails(key).help"
-                class="info-icon"
-              >?</span>
-            </label>
-            <strong class="col-sm-9 col-form-label">
-              <span v-if="value === true">Yes</span>
-              <span v-else-if="value === false">No</span>
-              <span
-                v-else-if="value instanceof String && isDate(value)"
-                v-b-tooltip.hover="value"
-              >
-                {{ formatDate(value) }}
-              </span>
-              <span v-else-if="value === null">---</span>
-              <span v-else>{{ value }}</span>
-            </strong>
-          </div>
-          <div class="form-group row">
-            <div class="offset-sm-3 col-sm-9">
-              <a
-                v-if="hero.purchased.plan.paymentMethod === 'Google'"
-                class="btn btn-primary btn-sm"
-                target="_blank"
-                :href="playOrdersUrl"
-              >
-                Play Console
-              </a>
-              <a
-                v-else-if="hero.purchased.plan.paymentMethod === 'Paypal'"
-                class="btn btn-primary btn-sm"
-                target="_blank"
-                :href="'https://www.paypal.com/billing/subscriptions/' + paymentDetails.customerId"
-              >
-                PayPal Dashboard
-              </a>
-              <a
-                v-else-if="hero.purchased.plan.paymentMethod === 'Stripe'"
-                class="btn btn-primary btn-sm"
-                target="_blank"
-                :href="'https://dashboard.stripe.com/customers/' + paymentDetails.customerId"
-              >
-                Stripe Dashboard
-              </a>
-            </div>
-          </div>
-        </div>
       </div>
       <div
         v-if="expand"
@@ -569,36 +474,17 @@
 <style lang="scss" scoped>
   @import '@/assets/scss/colors.scss';
 
-  .form-group {
-    margin-bottom: 0.4rem;
-  }
+.input-group-append {
+  width: auto;
 
-  .input-group-append {
-    width: auto;
-
-    .input-group-text {
-      border-bottom-right-radius: 2px;
-      border-top-right-radius: 2px;
-      font-weight: 600;
-      font-size: 0.8rem;
-      color: $gray-200;
-    }
-  }
-
-  .info-icon {
+  .input-group-text {
+    border-bottom-right-radius: 2px;
+    border-top-right-radius: 2px;
+    font-weight: 600;
     font-size: 0.8rem;
-    color: $purple-400;
-    cursor: pointer;
-    margin-left: 0.2rem;
-    background-color: $gray-500;
-    padding: 0.1rem 0.3rem;
-    border-radius: 0.2rem;
-  }
-
-  .info-icon:hover {
-    background-color: $purple-400;
-    color: white;
+    color: $gray-200;
   }
+}
 </style>
 
 <script>
@@ -609,55 +495,6 @@ import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks
 import saveHero from '../mixins/saveHero';
 import LoadingSpinner from '@/components/ui/loadingSpinner';
 
-const PLAY_CONSOLE_ORDERS_BASE_URL = import.meta.env.PLAY_CONSOLE_ORDERS_BASE_URL;
-
-const humanReadablePaymentDetails = {
-  customerId: {
-    label: 'Customer ID',
-    help: 'The unique identifier for the customer in the payment system.',
-  },
-  purchaseDate: {
-    label: 'Purchase Date',
-    help: 'The date when the subscription was purchased or renewed.',
-  },
-  originalPurchaseDate: {
-    label: 'Original Purchase Date',
-    help: 'The date when the subscription was first purchased.',
-  },
-  productId: {
-    label: 'Product ID',
-    help: 'The identifier for the product associated with the subscription.',
-  },
-  transactionId: {
-    label: 'Transaction ID',
-    help: 'The unique identifier for the last transaction in the payment system.',
-  },
-  isCanceled: {
-    label: 'Is Canceled',
-    help: 'Indicates whether the subscription has been canceled by the user or the system.',
-  },
-  isExpired: {
-    label: 'Is Expired',
-    help: 'Indicates whether the subscription has expired. A cancelled subscription may still be active until the end of the billing cycle.',
-  },
-  expirationDate: {
-    label: 'Termination Date',
-    help: 'The date when the subscription will expire or has expired.',
-  },
-  nextPaymentDate: {
-    label: 'Next Payment Date',
-    help: 'The date when the next payment is due. If the subscription is canceled or expired, this may be null.',
-  },
-  lastPaymentDate: {
-    label: 'Last Payment Date',
-    help: 'The date when the lastpayment was made for the subscription.',
-  },
-  failedPayments: {
-    label: 'Failed Payments',
-    help: 'Number of times the payment failed for this subscription.',
-  },
-};
-
 export default {
   components: {
     LoadingSpinner,
@@ -683,7 +520,6 @@ export default {
       isConvertingToGroupPlan: false,
       groupPlanID: '',
       subscriptionBlocks,
-      paymentDetails: null,
     };
   },
   computed: {
@@ -717,9 +553,6 @@ export default {
       }
       return terminationDate;
     },
-    playOrdersUrl () {
-      return `${PLAY_CONSOLE_ORDERS_BASE_URL}${this.paymentDetails?.transactionId || ''}`;
-    },
   },
   methods: {
     dateFormat (date) {
@@ -750,20 +583,6 @@ export default {
       this.isConvertingToGroupPlan = true;
       this.hero.purchased.plan.owner = '';
     },
-    getSubscriptionPaymentDetails () {
-      this.$store.dispatch('admin:getSubscriptionPaymentDetails', { userIdentifier: this.hero._id })
-        .then(details => {
-          if (details) {
-            this.paymentDetails = details;
-          } else {
-            alert('No payment details found.');
-          }
-        })
-        .catch(error => {
-          console.error('Error fetching subscription payment details:', error);
-          alert(`Failed to fetch payment details: ${error.message || 'Unknown error'}`);
-        });
-    },
     saveClicked (e) {
       e.preventDefault();
       if (this.isConvertingToGroupPlan) {
@@ -782,31 +601,6 @@ export default {
         this.$emit('changeUserIdentifier', id);
       }
     },
-    getHumanReadablePaymentDetails (key) {
-      return humanReadablePaymentDetails[key] || { label: key, help: '' };
-    },
-    isDate (date) {
-      return moment(date).isValid();
-    },
-    formatDate (date) {
-      return date ? moment(date).format('MM/DD/YYYY') : '---';
-    },
-    isSubscribed () {
-      console.log(this.hero.purchased.plan.customerId, this.hero.purchased.plan.dateTerminated);
-      return this.hero.purchased.plan
-        && this.hero.purchased.plan.customerId
-        && this.hero.purchased.plan.planId
-        && this.hero.purchased.plan.paymentMethod
-        && (
-          !this.hero.purchased.plan.dateTerminated
-          || moment(this.hero.purchased.plan.dateTerminated).isAfter(moment())
-        );
-    },
-    isCancelled () {
-      return this.hero.purchased.plan
-        && this.hero.purchased.plan.dateTerminated
-        && this.hero.purchased.plan.dateTerminated !== '';
-    },
   },
 };
 </script>

website/client/src/components/admin/admin-panel/user-support/userHistory.vue

@@ -226,7 +226,7 @@ export default {
       }
     },
     async retrieveUserHistory () {
-      const history = await this.$store.dispatch('admin:getUserHistory', { userIdentifier: this.hero._id });
+      const history = await this.$store.dispatch('adminPanel:getUserHistory', { userIdentifier: this.hero._id });
       this.armoire = history.armoire;
       this.questInviteResponses = history.questInviteResponses;
       this.cron = history.cron;

website/client/src/components/admin/container.vue

@@ -8,13 +8,6 @@
       >
         {{ $t('adminPanel') }}
       </router-link>
-      <router-link
-        v-if="hasPermission(user, 'groupSupport')"
-        class="nav-link"
-        :to="{name: 'groupAdmin'}"
-      >
-        {{ $t('groupAdmin') }}
-      </router-link>
       <router-link
         v-if="hasPermission(user, 'accessControl')"
         class="nav-link"

website/client/src/components/admin/formRow.vue

@@ -1,47 +0,0 @@
-<template>
-  <div class="form-group row">
-    <label class="col-sm-3 col-form-label"><slot name="label">{{ label }}</slot></label>
-    <div class="col-sm-9">
-      <slot>
-        <textarea
-          v-if="inputType === 'textarea'"
-          :value="value"
-          class="form-control"
-          :rows="rows"
-          @input="$emit('input', $event.target.value)"
-        ></textarea>
-        <input
-          v-else
-          :value="value"
-          class="form-control"
-          :type="inputType"
-          @input="$emit('input', $event.target.value)"
-        >
-      </slot>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  model: {
-    prop: 'value',
-    event: 'input',
-  },
-  props: {
-    label: {
-      type: String,
-    },
-    value: {
-      type: [String, Boolean],
-    },
-    inputType: {
-      type: String,
-      default: 'text',
-    },
-    rows: {
-      default: 3,
-    },
-  },
-};
-</script>

website/client/src/components/admin/groups/group-support/groupData.vue

@@ -1,45 +0,0 @@
-<template>
-  <form>
-    <form-row
-      v-model="group.name"
-      :label="$t('groupName')"
-    />
-    <form-row
-      v-model="group.summary"
-      :label="$t('guildSummary')"
-      input-type="textarea"
-    />
-    <form-row
-      v-model="group.description"
-      :label="$t('groupDescription')"
-      input-type="textarea"
-      rows="6"
-    />
-    <form-row
-      v-model="group.bannedWordsAllowed"
-      :label="$t('bannedWordsAllowed')"
-      input-type="checkbox"
-    />
-    <form-row
-      v-model="group.leaderOnly.challenges"
-      :label="$t('leaderOnlyChallenges')"
-      input-type="checkbox"
-    />
-  </form>
-</template>
-
-<script>
-import formRow from '@/components/admin/formRow.vue';
-
-export default {
-  components: {
-    formRow,
-  },
-  props: {
-    group: {
-      type: Object,
-      required: true,
-    },
-  },
-};
-</script>

website/client/src/components/admin/groups/group-support/index.vue

@@ -1,69 +0,0 @@
-<template>
-  <div v-if="hasPermission(user, 'groupSupport')">
-    <h2>{{ group.name }}</h2>
-    <supportContainer
-      :title="$t('groupData')"
-    >
-      <groupData
-        :group="group"
-      />
-    </supportContainer>
-    <supportContainer
-      :title="$t('groupPlanSubscription')"
-    />
-    <supportContainer
-      v-if="group.type === 'party'"
-      :title="$t('questDetails')"
-    />
-    <supportContainer
-      :title="$t('members')"
-    >
-      <members
-        :group="group"
-      />
-    </supportContainer>
-  </div>
-</template>
-
-<script>
-import { userStateMixin } from '../../../../mixins/userState';
-import supportContainer from '../../supportContainer.vue';
-import groupData from './groupData.vue';
-import members from './members.vue';
-
-export default {
-  components: {
-    supportContainer,
-    groupData,
-    members,
-  },
-  mixins: [userStateMixin],
-  data () {
-    return {
-      groupId: '',
-      group: {},
-    };
-  },
-  watch: {
-    groupId () {
-      this.loadGroup(this.groupId);
-    },
-  },
-  mounted () {
-    this.groupId = this.$route.params.groupId;
-  },
-  methods: {
-    clearData () {
-      this.group = {};
-    },
-    async loadGroup (groupId) {
-      this.$emit('changeGroupId', groupId);
-      this.group = await this.$store.dispatch('admin:getGroup', { groupId });
-    },
-    async updateGroup () {
-      await this.$store.dispatch('admin:updateGroup', { group: this.group });
-      this.$emit('groupSaved', this.group);
-    },
-  },
-};
-</script>

website/client/src/components/admin/groups/group-support/members.vue

@@ -1,29 +0,0 @@
-<template>
-  <form-row
-    :label="$t('groupLeader')"
-  >
-    <strong class="col-form-label">
-      <router-link
-        :to="{'name': 'adminPanelUser', 'params': {'userIdentifier': group.leader }}"
-      >
-        {{ group.leader }}
-      </router-link>
-    </strong>
-  </form-row>
-</template>
-
-<script>
-import formRow from '@/components/admin/formRow.vue';
-
-export default {
-  components: {
-    formRow,
-  },
-  props: {
-    group: {
-      type: Object,
-      required: true,
-    },
-  },
-};
-</script>

website/client/src/components/admin/groups/index.vue

@@ -1,93 +0,0 @@
-<template>
-  <div class="row standard-page col-12 d-flex justify-content-center">
-    <div class="group-admin-content">
-      <h1>{{ $t("groupAdmin") }}</h1>
-      <form
-        class="form-inline"
-        @submit.prevent="loadGroup(groupID)"
-      >
-        <div class="input-group col pl-0 pr-0">
-          <input
-            v-model="groupID"
-            class="form-control"
-            type="text"
-            placeholder="Group ID"
-          >
-          <div class="input-group-append">
-            <button
-              class="btn btn-primary"
-              type="button"
-              :disabled="!groupID"
-              @click="loadGroup(groupID)"
-            >
-              Load
-            </button>
-          </div>
-        </div>
-      </form>
-
-      <router-view
-        class="mt-3"
-        @changeGroupId="changeGroupId"
-      />
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-  .uidField {
-    min-width: 45ch;
-  }
-
-  .input-group-append {
-    width:auto;
-  }
-
-  .group-admin-content {
-    flex: 0 0 800px;
-    max-width: 800px;
-  }
-</style>
-
-<script>
-import VueRouter from 'vue-router';
-import { mapState } from '@/libs/store';
-
-const { isNavigationFailure, NavigationFailureType } = VueRouter;
-
-export default {
-  data () {
-    return {
-      groupID: '',
-    };
-  },
-  computed: {
-    ...mapState({ user: 'user.data' }),
-  },
-  mounted () {
-    this.$store.dispatch('common:setTitle', {
-      section: this.$t('groupAdmin'),
-    });
-  },
-  methods: {
-    changeGroupId (id) {
-      this.groupID = id;
-    },
-    async loadGroup (groupId) {
-      if (this.$router.currentRoute.name === 'groupAdminGroup') {
-        await this.$router.push({
-          name: 'groupAdmin',
-        });
-      }
-      await this.$router.push({
-        name: 'groupAdminGroup',
-        params: { groupId },
-      }).catch(failure => {
-        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-          this.$router.go();
-        }
-      });
-    },
-  },
-};
-</script>

website/client/src/components/admin/supportContainer.vue

@@ -1,53 +0,0 @@
-<template>
-  <div class="card mt-2">
-    <div class="card-header">
-      <h3
-        class="mb-0 mt-0"
-        :class="{'open': expand}"
-        @click="expand = !expand"
-      >
-        <slot name="title">
-          {{ title }}
-        </slot>
-      </h3>
-    </div>
-    <div
-      v-if="expand"
-      class="card-body"
-    >
-      <slot></slot>
-    </div>
-    <div
-      v-if="expand && onSave"
-      class="card-footer"
-    >
-      <button
-        class="btn btn-primary mt-1"
-        @click="onSave"
-      >
-        {{ $t('save') }}
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  props: {
-    title: {
-      type: String,
-      required: false,
-    },
-    onSave: {
-      type: Function,
-      required: false,
-    },
-  },
-  data () {
-    return {
-      expand: false,
-    };
-  },
-};
-</script>

website/client/src/components/auth/registerLoginReset.vue

@@ -311,7 +311,7 @@
         <input
           id="passwordInput"
           v-model="password"
-          class="form-control dark input-with-error"
+          class="form-control input-with-error"
           type="password"
           :placeholder="$t('password')"
           :class="{'input-invalid': passwordInvalid, 'input-valid': passwordValid}"
@@ -323,7 +323,7 @@
           {{ $t('minPasswordLength') }}
         </div>
       </div>
-      <div class="form-group mb-4">
+      <div class="form-group">
         <label
           v-once
           for="confirmPasswordInput"
@@ -331,7 +331,7 @@
         <input
           id="confirmPasswordInput"
           v-model="passwordConfirm"
-          class="form-control dark input-with-error"
+          class="form-control input-with-error"
           type="password"
           :placeholder="$t('confirmPasswordPlaceholder')"
           :class="{'input-invalid': passwordConfirmInvalid, 'input-valid': passwordConfirmValid}"
@@ -344,14 +344,13 @@
         </div>
       </div>
       <div class="text-center">
-        <button
-          class="btn btn-info w-100"
-          :disabled="!password || !passwordConfirm
-            || password !== passwordConfirm || resetPasswordSetNewOneData.hasError"
+        <div
+          class="btn btn-info"
+          :enabled="!resetPasswordSetNewOneData.hasError"
           @click="resetPasswordSetNewOneLink()"
         >
           {{ $t('setNewPass') }}
-        </button>
+        </div>
       </div>
     </form>
   </div>
@@ -673,7 +672,7 @@ export default {
 
       this.login();
     },
-    forgotPasswordLink: debounce(async function forgotPassLink () {
+    async forgotPasswordLink () {
       if (!this.username) {
         window.alert(this.$t('missingEmail')); // eslint-disable-line no-alert
         return;
@@ -684,7 +683,7 @@ export default {
       });
 
       window.alert(this.$t('newPassSent')); // eslint-disable-line no-alert
-    }, 500),
+    },
     async resetPasswordSetNewOneLink () {
       if (!this.password) {
         window.alert(this.$t('missingNewPassword')); // eslint-disable-line no-alert

website/client/src/components/bannedAccountModal.vue

@@ -43,11 +43,9 @@ export default {
       const AUTH_SETTINGS = localStorage.getItem(LOCALSTORAGE_AUTH_KEY);
       const parseSettings = JSON.parse(AUTH_SETTINGS);
       const userId = parseSettings ? parseSettings.auth.apiId : '';
-      const username = this.$store?.state?.user?.data?.auth?.local?.username || '';
 
       return this.$t('accountSuspended', {
         userId,
-        username,
         communityManagerEmail: COMMUNITY_MANAGER_EMAIL,
       });
     },

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

@@ -7,6 +7,7 @@
       @update-challenge="updateChallenge"
     />
     <close-challenge-modal
+      :members="members"
       :challenge-id="challenge._id"
       :prize="challenge.prize"
       :flag-count="challenge.flagCount"
@@ -71,40 +72,32 @@
         </div>
         <div class="col-12 col-md-6 text-right">
           <div
-            class="box member-count p-2"
+            class="box member-count"
             @click="showMemberModal()"
           >
-            <div class="box-content">
-              <div class="icon-number-row">
-                <div
-                  class="svg-icon member-icon"
-                  v-html="icons.memberIcon"
-                ></div>
-                <span class="number">{{ challenge.memberCount }}</span>
-              </div>
-              <div
-                v-once
-                class="details"
-              >
-                {{ $t('participantsTitle') }}
-              </div>
+            <div
+              class="svg-icon member-icon"
+              v-html="icons.memberIcon"
+            ></div>
+            {{ challenge.memberCount }}
+            <div
+              v-once
+              class="details"
+            >
+              {{ $t('participantsTitle') }}
             </div>
           </div>
-          <div class="box prize-count p-2">
-            <div class="box-content">
-              <div class="icon-number-row">
-                <div
-                  class="svg-icon gem-icon"
-                  v-html="icons.gemIcon"
-                ></div>
-                <span class="number">{{ challenge.prize || 0 }}</span>
-              </div>
-              <div
-                v-once
-                class="details"
-              >
-                {{ $t('prize') }}
-              </div>
+          <div class="box">
+            <div
+              class="svg-icon gem-icon"
+              v-html="icons.gemIcon"
+            ></div>
+            {{ challenge.prize || 0 }}
+            <div
+              v-once
+              class="details"
+            >
+              {{ $t('prize') }}
             </div>
           </div>
         </div>
@@ -311,6 +304,7 @@
 
   .box {
     display: inline-block;
+    padding: 1em;
     border-radius: 2px;
     background-color: $white;
     box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
@@ -320,88 +314,22 @@
     text-align: center;
     font-size: 20px;
     vertical-align: bottom;
-    overflow: hidden;
-    position: relative;
 
     &.member-count:hover {
       cursor: pointer;
     }
 
-    .box-content {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      height: 100%;
-      width: 100%;
-    }
-
-    .icon-number-row {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-bottom: 0.1em;
-
-      .number {
-        font-size: 20px;
-        font-weight: normal;
-        margin-left: 0.2em;
-      }
-    }
-
     .svg-icon {
       width: 30px;
       display: inline-block;
+      margin-right: .2em;
       vertical-align: bottom;
     }
 
     .details {
       font-size: 12px;
+      margin-top: 0.4em;
       color: $gray-200;
-      width: 100%;
-      padding: 0 4px;
-      line-height: 1.15;
-      word-break: break-word;
-      max-height: 2.3em;
-      overflow: visible;
-    }
-
-    &.member-count {
-      .icon-number-row {
-        .svg-icon {
-          width: 24px;
-          height: 24px;
-        }
-
-        .number {
-          font-size: 18px;
-        }
-      }
-
-      .details {
-        font-size: 11px;
-        line-height: 1.1;
-        max-height: 2.2em;
-      }
-    }
-
-    &.prize-count {
-      .icon-number-row {
-        .svg-icon {
-          width: 24px;
-          height: 24px;
-        }
-
-        .number {
-          font-size: 18px;
-        }
-      }
-
-      .details {
-        font-size: 11px;
-        line-height: 1.1;
-        max-height: 2.2em;
-      }
     }
   }
 
@@ -696,6 +624,7 @@ export default {
       this.members = [];
     },
     closeChallenge () {
+      this.initialMembersLoad();
       this.$root.$emit('bv::show::modal', 'close-challenge-modal');
     },
     edit () {

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

@@ -4,7 +4,6 @@
       id="close-challenge-modal"
       :title="$t('endChallenge')"
       size="md"
-      :hide-header="false"
     >
       <div
         slot="modal-header"
@@ -16,9 +15,6 @@
         >
           {{ $t('endChallenge') }}
         </h2>
-        <close-x
-          @close="$root.$emit('bv::hide::modal', 'close-challenge-modal')"
-        />
       </div>
       <div class="row text-center">
         <span
@@ -32,67 +28,28 @@
           class="col-12"
         >
           <div class="col-12">
-            <div class="badge-section">
-              <div
-                class="gems-left"
-                v-html="icons.gemsOrange"
-              ></div>
-              <div
-                class="challenge-badge"
-                v-html="icons.endChallengeBadge"
-              ></div>
-              <div
-                class="gems-right"
-                v-html="icons.gemsPurple"
-              ></div>
+            <div class="support-habitica">
+              <!-- @TODO: Add challenge achievement badge here-->
             </div>
           </div>
           <div class="col-12">
             <strong v-once>{{ $t('selectChallengeWinnersDescription') }}</strong>
           </div>
-          <div class="col-12 search-input-container">
-            <div class="search-input-wrapper">
-              <div
-                class="search-icon"
-                v-html="icons.search"
-              ></div>
-              <input
-                v-model="searchTerm"
-                class="search-input"
-                type="text"
-                placeholder="@Username"
-                @input="searchMembers"
-                @focus="showResults = true"
-                @blur="handleBlur"
-              >
-              <div
-                v-if="showResults && filteredMembers.length > 0"
-                class="search-results"
-              >
-                <div
-                  v-for="member in filteredMembers"
-                  :key="member._id"
-                  class="search-result-item"
-                  @mousedown="selectMember(member)"
-                >
-                  {{ getMemberDisplayName(member) }}
-                </div>
-              </div>
-            </div>
+          <div class="col-12">
+            <member-search-dropdown
+              :text="winnerText"
+              :members="members"
+              :challenge-id="challengeId"
+              @member-selected="selectMember"
+            />
           </div>
           <div class="col-12">
             <button
-              class="btn award-winner-btn"
-              :class="{'has-winner': winner._id}"
-              :disabled="!winner._id"
+              v-once
+              class="btn btn-primary"
               @click="closeChallenge"
             >
-              <span>{{ $t('awardWinners') }}</span>
-              <div
-                class="gem-icon"
-                v-html="icons.gem"
-              ></div>
-              <span>{{ prize }} {{ prize === 1 ? $t('gem') : $t('gems') }}</span>
+              {{ $t('awardWinners') }}
             </button>
           </div>
         </span>
@@ -103,27 +60,14 @@
           </div>
         </div>
         <div class="col-12">
-          <strong
-            v-once
-            class="delete-challenge-text"
-          >{{ $t('doYouWantedToDeleteChallenge') }}</strong>
-        </div>
-        <div
-          v-once
-          class="col-12 refund-text"
-        >
-          {{ $t('deleteChallengeRefundDescription') }}
+          <strong v-once>{{ $t('doYouWantedToDeleteChallenge') }}</strong>
         </div>
         <div class="col-12">
           <button
             v-once
-            class="btn btn-danger delete-challenge-btn"
+            class="btn btn-danger"
             @click="deleteChallenge()"
           >
-            <div
-              class="svg-icon color delete-icon"
-              v-html="icons.deleteIcon"
-            ></div>
             {{ $t('deleteChallenge') }}
           </button>
         </div>
@@ -138,7 +82,6 @@
 
 <style lang='scss'>
   @import '@/assets/scss/colors.scss';
-  @import '@/assets/scss/button.scss';
 
   #close-challenge-modal {
     h2 {
@@ -151,190 +94,26 @@
 
     .header-wrap {
       width: 100%;
-      padding-top: 32px;
-      position: relative;
+      padding-top: 2em;
     }
 
-    .modal-close {
-      position: absolute;
-      right: 16px;
-      top: 16px;
-      padding: 0;
-      margin: 0;
-    }
-
-    .search-input-container {
-      margin-top: 1em !important;
-    }
-
-    .search-input-wrapper {
-      position: relative;
-      width: 384px;
+    .support-habitica {
+      background-image: url('@/assets/svg/for-css/support-habitica-gems.svg?raw');
+      width: 325px;
+      height: 89px;
       margin: 0 auto;
-
-      .search-icon {
-        position: absolute;
-        left: 12px;
-        top: 50%;
-        transform: translateY(-55%);
-        width: 16px;
-        height: 16px;
-        color: $gray-200;
-        pointer-events: none;
-        display: flex;
-        align-items: center;
-      }
-
-      .search-input {
-        width: 100%;
-        height: 32px;
-        padding-left: 36px;
-        padding-right: 12px;
-        border: 1px solid $gray-400;
-        border-radius: 4px;
-        font-size: 14px;
-        transition: border-color 0.2s ease, border-width 0.2s ease;
-
-        &:focus {
-          outline: none;
-          border: 2px solid $purple-400;
-        }
-
-        &::placeholder {
-          color: $gray-300;
-        }
-      }
-
-      .search-results {
-        position: absolute;
-        top: 100%;
-        left: 0;
-        right: 0;
-        background: $white;
-        border: 1px solid $gray-400;
-        border-top: none;
-        border-radius: 0 0 4px 4px;
-        max-height: 200px;
-        overflow-y: auto;
-        z-index: 1000;
-        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-
-        .search-result-item {
-          padding: 8px 16px;
-          cursor: pointer;
-          transition: all 0.2s ease;
-          text-align: left;
-
-          &:hover {
-            background-color: $purple-600;
-            color: $purple-300;
-          }
-        }
-      }
-    }
-
-    .delete-challenge-text {
-      color: $maroon-50;
-    }
-
-    .refund-text {
-      font-family: 'Roboto', sans-serif;
-      font-size: 14px;
-      line-height: 24px;
-      font-weight: 400;
-      color: $gray-50;
-      margin-top: 0.5em !important;
-    }
-
-    .delete-challenge-btn {
-      font-family: 'Roboto', sans-serif;
-      font-size: 14px;
-      font-weight: 700;
-      line-height: 24px;
-      display: inline-flex;
-      align-items: center;
-      gap: 8px;
-
-      .delete-icon {
-        width: 16px;
-        height: 16px;
-        display: inline-flex;
-      }
-    }
-
-    .award-winner-btn {
-      display: inline-flex;
-      align-items: center;
-      gap: 8px;
-      min-height: 32px;
-      padding: 4px 12px;
-      transition: all 0.2s ease;
-
-      &:not(:disabled) {
-        background-color: $white;
-        color: $gray-200;
-        border: 1px solid $gray-400;
-        box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
-
-        &.has-winner {
-          background-color: $purple-200;
-          color: $white;
-          border-color: $purple-200;
-        }
-
-        &:hover:not(.has-winner) {
-          background-color: $gray-700;
-        }
-      }
-
-      .gem-icon {
-        width: 20px;
-        height: 20px;
-        display: inline-flex;
-        align-items: center;
-        color: $gems-color;
-      }
-    }
-
-    .badge-section {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 1.5rem;
-      margin: -24px auto 0;
-      padding: 0.5rem 0;
-
-      .gems-left, .gems-right {
-        width: 64px;
-        height: 64px;
-        flex-shrink: 0;
-      }
-
-      .challenge-badge {
-        width: 48px;
-        height: 52px;
-        flex-shrink: 0;
-      }
     }
 
     .modal-footer, .modal-header {
       border: none !important;
     }
 
-    .modal-header {
-      padding: 0 !important;
-    }
-
     .footer-wrap {
       display: none;
     }
 
     .col-12 {
-      margin-top: 1.5em;
-    }
-
-    .col-12:first-child {
-      margin-top: 0;
+      margin-top: 2em;
     }
 
     .or {
@@ -344,41 +123,21 @@
       margin-right: auto;
       margin-left: auto;
       font-weight: bold;
-      color: $gray-100;
     }
   }
 </style>
 
 <script>
-import debounce from 'lodash/debounce';
-import searchIcon from '@/assets/svg/for-css/search.svg?raw';
-import deleteIcon from '@/assets/svg/delete.svg?raw';
-import gemIcon from '@/assets/svg/gem.svg?raw';
-import endChallengeBadge from '@/assets/svg/for-css/end_challenge_badge.svg?raw';
-import gemsOrange from '@/assets/svg/for-css/orange100_red100_yellow100_gems.svg?raw';
-import gemsPurple from '@/assets/svg/for-css/purple200_green10_blue100_gems.svg?raw';
-import closeX from '@/components/ui/closeX';
+import memberSearchDropdown from '@/components/members/memberSearchDropdown';
 
 export default {
   components: {
-    closeX,
+    memberSearchDropdown,
   },
-  props: ['challengeId', 'prize', 'flagCount'],
+  props: ['challengeId', 'members', 'prize', 'flagCount'],
   data () {
     return {
       winner: {},
-      searchTerm: '',
-      showResults: false,
-      filteredMembers: [],
-      isSearching: false,
-      icons: Object.freeze({
-        search: searchIcon,
-        deleteIcon,
-        gem: gemIcon,
-        endChallengeBadge,
-        gemsOrange,
-        gemsPurple,
-      }),
     };
   },
   computed: {
@@ -390,58 +149,9 @@ export default {
       return this.flagCount > 0;
     },
   },
-  created () {
-    this.searchMembersDebounced = debounce(this.performSearch, 500);
-  },
   methods: {
-    searchMembers () {
-      if (!this.searchTerm) {
-        this.filteredMembers = [];
-        this.isSearching = false;
-        return;
-      }
-
-      this.isSearching = true;
-      this.searchMembersDebounced();
-    },
-    async performSearch () {
-      if (!this.searchTerm) {
-        this.filteredMembers = [];
-        this.isSearching = false;
-        return;
-      }
-
-      const searchTerm = this.searchTerm.replace('@', '');
-
-      try {
-        const members = await this.$store.dispatch('members:getChallengeMembers', {
-          challengeId: this.challengeId,
-          searchTerm,
-          includeAllPublicFields: true,
-        });
-
-        this.filteredMembers = members.slice(0, 10);
-      } catch (err) {
-        this.filteredMembers = [];
-      } finally {
-        this.isSearching = false;
-      }
-    },
-    getMemberDisplayName (member) {
-      if (member.auth?.local?.username) {
-        return `@${member.auth.local.username}`;
-      }
-      return member.profile?.name || '';
-    },
     selectMember (member) {
       this.winner = member;
-      this.searchTerm = this.getMemberDisplayName(member);
-      this.showResults = false;
-    },
-    handleBlur () {
-      setTimeout(() => {
-        this.showResults = false;
-      }, 200);
     },
     async closeChallenge () {
       this.challenge = await this.$store.dispatch('challenges:selectChallengeWinner', {

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

@@ -52,21 +52,17 @@
       <div
         v-if="!group.purchased.plan.dateTerminated
           && group.purchased.plan.paymentMethod === 'Stripe'"
-        class="btn btn-primary mb-3"
+        class="btn btn-primary"
         @click="redirectToStripeEdit({groupId: group.id})"
       >
         {{ $t('subUpdateCard') }}
       </div>
-      <div v-if="!group.purchased.plan.dateTerminated">
-        <div class="small gray-50 mb-3" v-once>
-          {{ $t('groupPlanBillingFYIShort') }}
-        </div>
-        <div
-          class="btn btn-sm btn-danger"
-          @click="cancelSubscriptionConfirm({group: group})"
-        >
-          {{ $t('cancelGroupSub') }}
-        </div>
+      <div
+        v-if="!group.purchased.plan.dateTerminated"
+        class="btn btn-sm btn-danger"
+        @click="cancelSubscriptionConfirm({group: group})"
+      >
+        {{ $t('cancelGroupSub') }}
       </div>
     </div>
   </div>

website/client/src/components/group-plans/groupPlanCreationModal.vue

@@ -82,7 +82,9 @@
         <select-translated-array
           :items="[
             'groupParentChildren',
+            'groupCouple',
             'groupFriends',
+            'groupCoworkers',
             'groupManager',
             'groupTeacher'
           ]"

website/client/src/components/groups/questDetailModal.vue

@@ -218,19 +218,13 @@
     flex-direction: row;
     flex-wrap: wrap;
     gap: 0.5rem;
-    max-width: 400px;
-    width: 100%;
+
+    // somehow the browser felt like setting this 398px instead
+    // now its fixed to 400 :)
+    width: 400px;
+
     margin-bottom: 1.5rem;
 
-    @media (max-width: 589px) {
-      max-width: 100%;
-      justify-content: center;
-    }
-
-    @media (max-width: 353px) {
-      gap: 0.25rem;
-    }
-
     .quest-col {
       ::v-deep {
         .item-wrapper {
@@ -257,28 +251,6 @@
     ::v-deep & {
       .modal-dialog {
         width: 448px !important;
-        max-width: calc(100vw - 20px);
-        margin: 0.5rem auto;
-        display: flex;
-
-        @media (max-width: 468px) {
-          width: 100% !important;
-        }
-
-        @media (max-width: 353px) {
-          width: 100% !important;
-          margin: 0.25rem auto;
-        }
-      }
-
-      .modal-content {
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-
-        @media (max-width: 300px) {
-          border-radius: 0;
-        }
       }
     }
 

website/client/src/components/header/banners/privacy.vue

@@ -1,8 +1,8 @@
 <template>
   <div
-    v-if="!hidden"
-    id="privacy-banner"
     class="banner d-flex align-items-center justify-content-between py-3 px-4"
+    id="privacy-banner"
+    v-if="!hidden"
   >
     <p
       class="mr-3 mb-0"

website/client/src/components/header/notifications/g1g1.vue

@@ -1,43 +1,37 @@
 <template>
   <div
-    class="notification d-flex justify-content-center align-items-center"
+    class="notification d-flex flex-column justify-content-center text-center"
   >
-    <img
-      src="@/assets/images/gifts_start.svg"
-      class="gift-start"
-      alt=""
+    <strong
+      v-once
+      class="mx-auto mb-2"
     >
-    <div class="content-wrapper d-flex flex-column justify-content-center text-center">
-      <strong
+      {{ $t('g1g1') }}
+    </strong>
+    <small
+      v-once
+      class="mx-4 mb-3"
+    >
+      {{ $t('g1g1Details') }}
+    </small>
+    <div
+      class="btn-secondary mx-auto d-flex"
+      @click="showSelectUser()"
+    >
+      <div
         v-once
-        class="mx-auto mb-2"
-      >
-        {{ $t('g1g1') }}
-      </strong>
-      <small
-        v-once
-        class="mx-4 mb-3"
-      >
-        {{ $t('g1g1Details') }}
-      </small>
-      <button
-        class="btn btn-secondary mx-auto"
-        @click="showSelectUser()"
+        class="m-auto"
       >
         {{ $t('sendGift') }}
-      </button>
+      </div>
     </div>
-    <img
-      src="@/assets/images/gifts_start.svg"
-      class="gift-end"
-      alt=""
-    >
     <div
-      class="close-x"
+      class="notification-remove"
       @click.stop="remove()"
     >
       <div
-        class="svg-icon svg-close"
+        v-once
+        class="svg-icon"
         v-html="icons.close"
       ></div>
     </div>
@@ -47,89 +41,51 @@
 <style lang='scss' scoped>
   @import '@/assets/scss/colors.scss';
 
-  small {
+  small, strong {
     color: $white;
-    font-family: 'Roboto', sans-serif;
-    font-weight: 400;
-    font-style: normal;
-    font-size: 14px;
-    line-height: 1.714;
-    letter-spacing: 0;
-  }
-
-  strong {
-    color: $white;
-    font-family: 'Roboto', sans-serif;
-    font-weight: 700;
-    font-style: normal;
-    font-size: 14px;
-    line-height: 1.714;
   }
 
   .notification {
-    background-image: url('@/assets/images/gifts_bg.svg');
-    background-size: cover;
-    background-position: center;
+    background-image: url('@/assets/images/g1g1-notif.png');
     height: 10rem;
-    padding: 0;
+    padding: 3rem;
     position: relative;
     overflow: hidden;
     white-space: normal;
     cursor: pointer;
   }
 
-  .content-wrapper {
-    flex: 1;
-    padding: 2rem;
-    z-index: 1;
-  }
-
-  .gift-start {
-    height: 96px;
-    width: auto;
+  .notification-remove {
     position: absolute;
-    left: 0;
-    top: 50%;
-    transform: translateY(-50%);
-    z-index: 0;
-  }
+    width: 18px;
+    height: 18px;
+    padding: 4px;
+    right: 24px;
+    top: 24px;
 
-  .gift-end {
-    height: 96px;
-    width: auto;
-    position: absolute;
-    right: 0;
-    top: 50%;
-    transform: translateY(-50%) scaleX(-1);
-    z-index: 0;
-  }
-
-  .close-x {
-    position: absolute;
-    right: 16px;
-    top: 16px;
-    cursor: pointer;
-    z-index: 2;
-
-    &:hover .svg-close {
-      opacity: 0.75;
+    .svg-icon {
+      width: 10px;
+      height: 10px;
     }
+  }
 
-    .svg-close {
-      width: 18px;
-      height: 18px;
-      opacity: 0.5;
-      transition: opacity 0.2s ease;
-      pointer-events: none;
-    }
+  .btn-secondary {
+    width: 5.75rem;
+    min-height: 1.5rem;
+    border-radius: 2px;
+    border-color: $white;
+    box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
+    font-size: 12px;
+    font-weight: bold;
   }
 </style>
 
 <script>
-import closeIcon from '@/assets/svg/close-white.svg?raw';
+import closeIcon from '@/assets/svg/close-teal.svg?raw';
+import { mapActions } from '@/libs/store';
 
 export default {
-  props: ['notification', 'eventKey'],
+  props: ['notification'],
   data () {
     return {
       icons: Object.freeze({
@@ -138,11 +94,11 @@ export default {
     };
   },
   methods: {
+    ...mapActions({
+      readNotification: 'notifications:readNotification',
+    }),
     remove () {
-      if (this.eventKey) {
-        window.localStorage.setItem(`hide-g1g1-${this.eventKey}`, 'true');
-      }
-      this.$emit('notification-removed');
+      this.readNotification({ notificationId: this.notification.id });
     },
     showSelectUser () {
       this.$root.$emit('bv::show::modal', 'select-user-modal');

website/client/src/components/header/notifications/onboardingComplete.vue

@@ -71,7 +71,7 @@ export default {
   props: ['notification', 'canRemove'],
   methods: {
     action () {
-      this.$router.push(`/profile/${this.$store.state.user.data._id}#achievements`);
+      this.$router.push({ name: 'achievements' });
     },
   },
 };

website/client/src/components/header/notifications/unallocatedStatsPoints.vue

@@ -43,7 +43,7 @@ export default {
   },
   methods: {
     action () {
-      this.$router.push(`/profile/${this.$store.state.user.data._id}#stats`);
+      this.$router.push({ name: 'stats' });
     },
   },
 };

website/client/src/components/header/notificationsDropdown.vue

@@ -49,12 +49,6 @@
         v-if="showOnboardingGuide"
         :never-seen="hasSpecialBadge"
       />
-      <gift-one-get-one-notification
-        v-if="shouldShowG1g1"
-        :notification="g1g1Notification"
-        :event-key="g1g1EventKey"
-        @notification-removed="handleG1g1Removed"
-      />
       <component
         :is="notification.type"
         v-for="notification in notifications"
@@ -120,7 +114,6 @@
 <script>
 import * as quests from '@/../../common/script/content/quests';
 import { hasCompletedOnboarding } from '@/../../common/script/libs/onboarding';
-import find from 'lodash/find';
 import { mapState, mapActions } from '@/libs/store';
 import notificationsIcon from '@/assets/svg/notifications.svg?raw';
 import MenuDropdown from '../ui/customMenuDropdown';
@@ -158,7 +151,6 @@ export default {
     CARD_RECEIVED,
     CHALLENGE_INVITATION,
     GIFT_ONE_GET_ONE,
-    GiftOneGetOneNotification: GIFT_ONE_GET_ONE,
     GROUP_TASK_ASSIGNED,
     GROUP_TASK_CLAIMED,
     GROUP_TASK_NEEDS_WORK,
@@ -186,14 +178,17 @@ export default {
       hasSpecialBadge: false,
       quests,
       openStatus: undefined,
-      g1g1Hidden: false,
       actionableNotifications: [
         'GUILD_INVITATION', 'PARTY_INVITATION', 'CHALLENGE_INVITATION',
         'QUEST_INVITATION',
       ],
+      // A list of notifications handled by this component,
+      // listed in the order they should appear in the notifications panel.
+      // NOTE: Those not listed here won't be shown in the notification panel!
       handledNotifications: [
         'NEW_STUFF',
         'ITEM_RECEIVED',
+        'GIFT_ONE_GET_ONE',
         'GROUP_TASK_NEEDS_WORK',
         'GUILD_INVITATION',
         'PARTY_INVITATION',
@@ -212,10 +207,7 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      user: 'user.data',
-      currentEventList: 'worldState.data.currentEventList',
-    }),
+    ...mapState({ user: 'user.data' }),
     notificationsOrder () {
       // Returns a map of NOTIFICATION_TYPE -> POSITION
       const orderMap = {};
@@ -294,9 +286,9 @@ export default {
 
       return notifications;
     },
+    // The total number of notification, shown inside the dropdown
     notificationsCount () {
-      const g1g1Count = this.shouldShowG1g1 ? 1 : 0;
-      return this.notifications.length + g1g1Count;
+      return this.notifications.length;
     },
     hasUnseenNotifications () {
       return this.notifications.some(notification => (notification.seen === false));
@@ -307,30 +299,6 @@ export default {
     showOnboardingGuide () {
       return !hasCompletedOnboarding(this.user);
     },
-    currentG1g1Event () {
-      return find(this.currentEventList, event => event.promo === 'g1g1');
-    },
-    g1g1EventKey () {
-      if (!this.currentG1g1Event || !this.currentG1g1Event.start) return null;
-      const startDate = new Date(this.currentG1g1Event.start);
-      return `${startDate.getFullYear()}-${startDate.getMonth()}`;
-    },
-    shouldShowG1g1 () {
-      if (!this.currentG1g1Event) return false;
-      const eventKey = this.g1g1EventKey;
-      if (eventKey && window.localStorage.getItem(`hide-g1g1-${eventKey}`) === 'true') {
-        return false;
-      }
-      return !this.g1g1Hidden;
-    },
-    g1g1Notification () {
-      return {
-        type: 'GIFT_ONE_GET_ONE',
-        id: `g1g1-event-${this.currentG1g1Event?.start || 'default'}`,
-        data: {},
-        seen: false,
-      };
-    },
   },
   mounted () {
     const onboardingPanelState = getLocalSetting(CONSTANTS.keyConstants.ONBOARDING_PANEL_STATE);
@@ -396,9 +364,6 @@ export default {
     isActionable (notification) {
       return this.actionableNotifications.indexOf(notification.type) !== -1;
     },
-    handleG1g1Removed () {
-      this.g1g1Hidden = true;
-    },
   },
 
 };

website/client/src/components/header/userDropdown.vue

@@ -176,12 +176,7 @@ export default {
       }
     },
     showProfile (startingPage) {
-      const userId = this.$store.state.user.data._id;
-      let path = `/profile/${userId}`;
-      if (startingPage !== 'profile') {
-        path += `#${startingPage}`;
-      }
-      this.$router.push(path);
+      this.$router.push({ name: startingPage });
     },
     toLearnMore () {
       this.$router.push({ name: 'subscription' });

website/client/src/components/messages/messageCard.vue

@@ -454,14 +454,17 @@ export default {
     },
     isUserMentioned () {
       const message = this.msg;
+
       if (message.highlight) {
         return true;
       }
+
       const { user } = this;
+      const displayName = user.profile.name;
       const { username } = user.auth.local;
-      if (!username) return false;
-      const usernamePattern = new RegExp(`@${escapeRegExp(username)}(?:\\b|(?=[^a-zA-Z0-9_]))`, 'i');
-      message.highlight = usernamePattern.test(message.text);
+      const pattern = `@(${escapeRegExp(displayName)}|${escapeRegExp(username)})(\\b)`;
+      message.highlight = new RegExp(pattern, 'i').test(message.text);
+
       return message.highlight;
     },
     flagCountDescription () {
@@ -491,9 +494,6 @@ export default {
   },
   methods: {
     mapProfileLinksToModal () {
-      if (!this.$refs?.markdownContainer) {
-        return;
-      }
       const links = this.$refs.markdownContainer.getElementsByTagName('a');
       for (let i = 0; i < links.length; i += 1) {
         let link = links[i].pathname;

website/client/src/components/notifications.vue

@@ -328,8 +328,6 @@ export default {
       alreadyReadNotification,
       nextCron: null,
       handledNotifications,
-      isInitialLoadComplete: false,
-      pendingRebirthNotification: null,
     };
   },
   computed: {
@@ -455,18 +453,6 @@ export default {
 
       return this.runYesterDailies();
     },
-    async showPendingRebirthModal () {
-      if (this.pendingRebirthNotification) {
-        this.playSound('Achievement_Unlocked');
-        this.$root.$emit('bv::show::modal', 'rebirth');
-
-        await axios.post('/api/v4/notifications/read', {
-          notificationIds: [this.pendingRebirthNotification.id],
-        });
-
-        this.pendingRebirthNotification = null;
-      }
-    },
     showDeathModal () {
       this.playSound('Death');
       this.$root.$emit('bv::show::modal', 'death');
@@ -675,18 +661,6 @@ export default {
         this.showLevelUpNotifications(this.user.stats.lvl);
       }
       this.handleUserNotifications(this.user.notifications);
-
-      this.isInitialLoadComplete = true;
-
-      const hasRebirthConfirmationFlag = localStorage.getItem('show-rebirth-confirmation') === 'true';
-
-      if (hasRebirthConfirmationFlag) {
-        localStorage.removeItem('show-rebirth-confirmation');
-        this.playSound('Achievement_Unlocked');
-        this.$root.$emit('bv::show::modal', 'rebirth');
-      } else {
-        this.showPendingRebirthModal();
-      }
     },
     async handleUserNotifications (after) {
       if (this.$store.state.isRunningYesterdailies) return;
@@ -726,15 +700,8 @@ export default {
             this.$root.$emit('habitica:won-challenge', notification);
             break;
           case 'REBIRTH_ACHIEVEMENT':
-            if (localStorage.getItem('show-rebirth-confirmation') === 'true') {
-              markAsRead = false;
-            } else if (!this.isInitialLoadComplete) {
-              this.pendingRebirthNotification = notification;
-              markAsRead = false;
-            } else {
-              this.playSound('Achievement_Unlocked');
-              this.$root.$emit('bv::show::modal', 'rebirth');
-            }
+            this.playSound('Achievement_Unlocked');
+            this.$root.$emit('bv::show::modal', 'rebirth');
             break;
           case 'STREAK_ACHIEVEMENT':
             this.text(`${this.$t('streaks')}: ${this.user.achievements.streak}`, () => {

website/client/src/components/payments/successModal.vue

@@ -197,7 +197,9 @@
         <select-translated-array
           :items="[
             'groupParentChildren',
+            'groupCouple',
             'groupFriends',
+            'groupCoworkers',
             'groupManager',
             'groupTeacher'
           ]"

website/client/src/components/secondaryMenu.vue

@@ -12,12 +12,6 @@
   box-shadow: 0 1px 2px 0 rgba($black, 0.2);
   z-index: 9;
   height: 3rem;
-  flex-wrap: wrap;
-
-  @media (max-width: 683px) {
-    height: auto;
-    min-height: 3rem;
-  }
 }
 
 .nav-link {
@@ -29,19 +23,6 @@
   padding: 0.75rem;
 
   color: $gray-50;
-  white-space: nowrap;
-
-  @media (max-width: 683px) {
-    padding: 0.5rem;
-    font-size: 13px;
-    flex: 1 1 auto;
-    min-width: fit-content;
-  }
-
-  @media (max-width: 576px) {
-    padding: 0.5rem 0.4rem;
-    font-size: 12px;
-  }
 
   &.active {
     color: $purple-300;

website/client/src/components/settings/privacyModal.vue

@@ -105,7 +105,7 @@ export default {
   },
   data () {
     return {
-      privacyConsent: false,
+      privacyConsent: true,
     };
   },
   methods: {

website/client/src/components/settings/subscription.vue

@@ -189,7 +189,6 @@
             >
             </p>
             <div
-              v-if="paymentMethodLogo.icon"
               class="svg svg-icon mb-4"
               :class="paymentMethodLogo.class"
               v-html="paymentMethodLogo.icon"
@@ -206,13 +205,6 @@
                 <div>{{ $t('subUpdateCard') }}</div>
               </button>
             </div>
-            <div
-              v-once
-              v-if="!hasGroupPlan"
-              class="small text-center mb-4"
-            >
-              {{ $t('subscriptionBillingFYIShort') }}
-            </div>
             <div
               v-if="purchasedPlanExtraMonthsDetails.months > 0"
               class="extra-months green-10 py-2 px-3 mb-4"
@@ -415,13 +407,6 @@
         <div class="purple-bar my-auto"></div>
       </div>
       <div class="d-flex flex-column align-items-center mt-3">
-        <div
-          v-once
-          v-if="!hasSubscription"
-          class="small gray-100 w-50 text-center mb-5"
-        >
-          {{ $t('subscriptionBillingFYI') }}
-        </div>
         <div
           v-once
           class="svg-icon svg-gift-box mb-2"
@@ -646,7 +631,7 @@
     background-color: $purple-400;
     height: 1px;
     width: 50%;
-    max-width: 417px;
+    max-width: 432px;
   }
 
   .purple-gradient {
@@ -669,12 +654,6 @@
     margin-bottom: 16px;
   }
 
-  .small {
-    font-size: 12px;
-    line-height: 1.67;
-    max-width: 874px;
-  }
-
   .stats-card {
     border-radius: 8px;
     width: 192px;

website/client/src/components/shared/faqSidebar.vue

@@ -12,12 +12,14 @@
           class="staff col-6 p-0"
         >
           <div class="d-flex">
-            <div
+            <router-link
               class="title"
+              :to="{'name': 'userProfile', 'params': {'userId': user.uuid}}"
             >
               {{ user.name }}
-            </div>
+            </router-link>
             <div
+              v-if="user.type === 'Staff'"
               class="svg-icon staff-icon ml-1"
               v-html="icons.tierStaff"
             ></div>

website/client/src/components/shops/buyModal.vue

@@ -269,13 +269,7 @@
 
     .modal-dialog {
       width: 448px;
-      max-width: calc(100vw - 20px);
       box-sizing: border-box;
-      display: flex;
-
-      @media (max-width: 468px) {
-        width: 100%;
-      }
     }
 
     .badge-dialog {
@@ -352,23 +346,7 @@
 
     .content {
       text-align: center;
-      width: 100%;
-      max-width: 448px;
-      margin: 0 auto;
-
-      @media (max-width: 468px) {
-        max-width: 100%;
-      }
-    }
-
-    .modal-content {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-
-      @media (max-width: 300px) {
-        border-radius: 0;
-      }
+      width: 448px;
     }
 
     .item-wrapper {
@@ -586,7 +564,7 @@
 
     .limitedTime {
       height: 32px;
-      width: 100%;
+      width: 446px;
       font-size: 0.75rem;
       margin: 24px 0 0 0;
       background-color: $purple-300;
@@ -851,17 +829,10 @@ export default {
           - ownedMounts
           - ownedItems;
 
-        if (petsRemaining < 0) {
-          const confirmed = await new Promise(resolve => {
-            this.$root.$emit('habitica:purchase-confirm', {
-              message: this.$t('purchasePetItemConfirm', { itemText: this.item.text }),
-              currency: this.item.currency,
-              cost: this.item.value * this.selectedAmountToBuy,
-              resolve,
-            });
-          });
-          if (!confirmed) return;
-        }
+        if (
+          petsRemaining < 0
+          && !window.confirm(this.$t('purchasePetItemConfirm', { itemText: this.item.text })) // eslint-disable-line no-alert
+        ) return;
       }
 
       if (this.item.purchaseType === 'customization') {
@@ -873,23 +844,15 @@ export default {
         this.purchased(this.item.text);
       } else {
         const shouldConfirmPurchase = this.item.currency === 'gems' || this.item.currency === 'hourglasses';
-        if (shouldConfirmPurchase) {
-          const confirmed = await this.confirmPurchase(
-            this.item.currency,
-            this.item.value * this.selectedAmountToBuy,
-          );
-          if (!confirmed) {
-            return;
-          }
+        if (
+          shouldConfirmPurchase
+          && !this.confirmPurchase(this.item.currency, this.item.value * this.selectedAmountToBuy)
+        ) {
+          return;
         }
         if (this.genericPurchase) {
-          if (this.item.key === 'rebirth_orb') {
-            localStorage.setItem('show-rebirth-confirmation', 'true');
-          }
-          await this.makeGenericPurchase(this.item, 'buyModal', this.selectedAmountToBuy);
-          if (this.item.key !== 'rebirth_orb') {
-            await this.purchased(this.item.text);
-          }
+          this.makeGenericPurchase(this.item, 'buyModal', this.selectedAmountToBuy);
+          await this.purchased(this.item.text);
         }
       }
 

website/client/src/components/shops/market/sellModal.vue

@@ -111,22 +111,6 @@
 
     .modal-dialog {
       width: 448px;
-      max-width: calc(100vw - 20px);
-      display: flex;
-
-      @media (max-width: 468px) {
-        width: 100%;
-      }
-    }
-
-    .modal-content {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-
-      @media (max-width: 300px) {
-        border-radius: 0;
-      }
     }
 
     .modal-body {

website/client/src/components/shops/purchaseConfirmModal.vue

@@ -1,207 +0,0 @@
-<template>
-  <b-modal
-    id="purchase-confirm-modal"
-    :hide-footer="true"
-    :hide-header="true"
-    modal-class="purchase-confirm-modal"
-    centered
-  >
-    <div class="modal-content-wrapper">
-      <div class="top-bar"></div>
-      <div class="modal-body-content">
-        <div
-          class="currency-chip"
-          :class="currency"
-        >
-          <span
-            class="svg-icon icon-24"
-            v-html="icons[currency]"
-          ></span>
-          <span class="cost-value">{{ cost }}</span>
-        </div>
-        <h2 class="modal-title">
-          {{ $t('confirmPurchase') }}
-        </h2>
-        <p class="modal-subtitle">
-          {{ confirmationMessage }}
-        </p>
-        <div class="button-wrapper">
-          <button
-            class="btn btn-primary"
-            @click="confirm()"
-          >
-            {{ $t('confirm') }}
-          </button>
-          <button
-            class="btn-cancel"
-            @click="cancel()"
-          >
-            {{ $t('cancel') }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </b-modal>
-</template>
-
-<script>
-import svgGem from '@/assets/svg/gem.svg?raw';
-import svgHourglass from '@/assets/svg/hourglass.svg?raw';
-
-export default {
-  data () {
-    return {
-      confirmationMessage: '',
-      currency: 'gems',
-      cost: 0,
-      resolveCallback: null,
-      icons: Object.freeze({
-        gems: svgGem,
-        hourglasses: svgHourglass,
-      }),
-    };
-  },
-  mounted () {
-    this.$root.$on('habitica:purchase-confirm', config => {
-      this.confirmationMessage = config.message;
-      this.currency = config.currency || 'gems';
-      this.cost = config.cost || 0;
-      this.resolveCallback = config.resolve;
-      this.$root.$emit('bv::show::modal', 'purchase-confirm-modal');
-    });
-  },
-  beforeDestroy () {
-    this.$root.$off('habitica:purchase-confirm');
-  },
-  methods: {
-    confirm () {
-      if (this.resolveCallback) {
-        this.resolveCallback(true);
-      }
-      this.close();
-    },
-    cancel () {
-      if (this.resolveCallback) {
-        this.resolveCallback(false);
-      }
-      this.close();
-    },
-    close () {
-      this.$root.$emit('bv::hide::modal', 'purchase-confirm-modal');
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/colors.scss';
-
-::v-deep .purchase-confirm-modal {
-  .modal-dialog {
-    max-width: 330px;
-    margin: auto;
-  }
-
-  .modal-content {
-    border-radius: 8px;
-    overflow: hidden;
-    border: none;
-  }
-
-  .modal-body {
-    padding: 0;
-  }
-}
-
-.modal-content-wrapper {
-  display: flex;
-  flex-direction: column;
-}
-
-.top-bar {
-  height: 8px;
-  background-color: $purple-300;
-}
-
-.modal-body-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 0 24px 24px;
-}
-
-.currency-chip {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-top: 40px;
-  padding: 8px 20px;
-  border-radius: 20px;
-  font-size: 1.25rem;
-  font-weight: bold;
-  line-height: 1.4;
-
-  &.gems {
-    color: $gems-color;
-    background-color: rgba($green-10, 0.15);
-  }
-
-  &.hourglasses {
-    color: $hourglass-color;
-    background-color: rgba($blue-10, 0.15);
-  }
-
-  .icon-24 {
-    width: 24px;
-    height: 24px;
-  }
-}
-
-.modal-title {
-  margin-top: 16px;
-  margin-bottom: 0;
-  color: $purple-300;
-  font-family: 'Roboto Condensed', sans-serif;
-  font-weight: 700;
-  font-size: 20px;
-  text-align: center;
-}
-
-.modal-subtitle {
-  margin-top: 12px;
-  margin-bottom: 0;
-  font-family: Roboto, sans-serif;
-  font-weight: 700;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  text-align: center;
-  color: $gray-50;
-}
-
-.button-wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  margin-top: 16px;
-  gap: 8px;
-}
-
-.btn-cancel {
-  background: none;
-  border: none;
-  color: $purple-300;
-  font-family: Roboto, sans-serif;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  cursor: pointer;
-  padding: 8px 16px;
-
-  &:hover {
-    text-decoration: underline;
-  }
-}
-</style>

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

@@ -163,33 +163,8 @@
     }
 
     .modal-dialog {
+      margin-top: 8%;
       width: 448px !important;
-      max-width: calc(100vw - 20px);
-      display: flex;
-
-      @media (max-width: 468px) {
-        width: 100% !important;
-        margin: 3rem auto 0.5rem;
-      }
-
-      @media (max-width: 353px) {
-        margin: 2.5rem auto 0.25rem;
-      }
-    }
-
-    .badge-dialog {
-      left: -8px;
-      top: -8px;
-    }
-
-    .modal-content {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-
-      @media (max-width: 300px) {
-        border-radius: 0;
-      }
     }
 
     .content {
@@ -510,12 +485,8 @@ export default {
       this.selectedAmountToBuy = 1;
       this.$emit('change', $event);
     },
-    async buyItem () {
-      const confirmed = await this.confirmPurchase(
-        this.item.currency,
-        this.item.value * this.selectedAmountToBuy,
-      );
-      if (!confirmed) {
+    buyItem () {
+      if (!this.confirmPurchase(this.item.currency, this.item.value * this.selectedAmountToBuy)) {
         return;
       }
       this.makeGenericPurchase(this.item, 'buyQuestModal', this.selectedAmountToBuy);

website/client/src/components/static/communityGuidelines.vue

@@ -120,9 +120,9 @@
     >
     <ul>
       <li>
-        {{ $t('commGuideAKA', {habitName: 'Viirus', realName: 'Phillip'}) }}
-        ({{ $t('commGuideOnGitHub', {gitHubName: 'phillipthelen'}) }})
-        - Developer
+        {{ $t('commGuideAKA', {habitName: 'heyeilatan', realName: 'Natalie'}) }}
+        ({{ $t('commGuideOnGitHub', {gitHubName: 'CuriousMagpie'}) }})
+        - Web Developer
       </li>
       <li>
         {{ $t('commGuideAKA', {habitName: 'redphoenix', realName: 'Vicky'}) }}
@@ -133,6 +133,10 @@
         {{ $t('commGuideAKA', {habitName: 'Beffymaroo', realName: 'Beth'}) }}
         - Art, Community Management, Many Hats
       </li>
+      <li>
+        {{ $t('commGuideAKA', {habitName: 'SabreCat', realName: 'Sabe'}) }}
+        - Web Developer
+      </li>
       <li>
         {{ $t('commGuideAKA', {habitName: 'Apollo', realName: 'Tressley'}) }}
         - Designer
@@ -142,12 +146,8 @@
         - Mobile Designer
       </li>
       <li>
-        {{ $t('commGuideAKA', {habitName: 'SabreCat', realName: 'Kalista'}) }}
-        - Web Developer
-      </li>
-      <li>
-        {{ $t('commGuideAKA', {habitName: 'fizself', realName: 'Hafiz'}) }}
-        - Developer
+        {{ $t('commGuideAKA', {habitName: 'Viirus', realName: 'Phillip'}) }}
+        - Mobile Developer
       </li>
     </ul>
     <p v-html="$t('commGuidePara013')"></p>
@@ -156,7 +156,7 @@
       <em>
         Lemoness, lefnire, Slappybag, litenull, Shaner, Bobbyroberts99, wc8,
         Breadstrings, Megan, Blade, Daniel the Bard, deilann, shanaqui, Nakonana,
-        Dewines, Alys, Fox_town, MaybeSteveRogers, Cantras, and heyeilatan.
+        Dewines, Alys, Fox_town, MaybeSteveRogers, and Cantras.
       </em>
     </p>
     <h2 id="final">

website/client/src/components/static/groupPlans.vue

@@ -45,9 +45,6 @@
           <p class="gray-200">
             {{ $t('billedMonthly') }}
           </p>
-          <small class="gray-200">
-            {{ $t('groupPlanBillingFYI') }}
-          </small>
         </div>
         <div class="top-right"></div>
         <div class="d-flex justify-content-between align-items-middle w-100 gap-72 mb-100">
@@ -117,9 +114,6 @@
             <p class="gray-200">
               {{ $t('billedMonthly') }}
             </p>
-            <small class="gray-200">
-              {{ $t('groupPlanBillingFYI') }}
-            </small>
           </div>
           <div class="bot-right"></div>
         </div>
@@ -180,11 +174,6 @@
     line-height: 28px;
   }
 
-  small {
-    font-size: 12px;
-    line-height: 1.67;
-  }
-
   // Major layout elements
 
   .bottom-banner {

website/client/src/components/static/home.vue

@@ -11,12 +11,12 @@
     <privacy-banner
       class="privacy-banner"
     />
-    <div class="bg-purple-300 white pt-5">
+    <div class="bg-purple-300 white">
       <div>
         <div
           id="intro-signup"
         >
-          <div class="d-flex justify-content-center pb-5 mb-5">
+          <div class="d-flex justify-content-center">
             <div class="w-33 mr-5 mt-5">
               <img
                 src="@/assets/images/home/home-main@3x.png"

website/client/src/components/static/privacy.vue

@@ -64,11 +64,9 @@
       <li>sexual orientation; and</li>
       <li>information collected from a known child.</li>
     </ul>
-    <p>
-      <strong>
-        NOTE: Please do not provide us “sensitive personal information” or “sensitive personal data”, as those terms are defined under applicable privacy laws, unless we directly request that you do so. If you feel, after careful consideration, that it is necessary to provide us certain sensitive personal information or data, please provide us the minimum amount of such information or data that is necessary.
-      </strong>
-    </p>
+    <p><strong>
+      NOTE: Please do not provide us “sensitive personal information” or “sensitive personal data”, as those terms are defined under applicable privacy laws, unless we directly request that you do so. If you feel, after careful consideration, that it is necessary to provide us certain sensitive personal information or data, please provide us the minimum amount of such information or data that is necessary.
+    </strong></p>
     <h3 id="section_1_1">
       1.1 Information You Provide Directly
     </h3>
@@ -619,7 +617,7 @@
       7. General Audience Services
     </h2>
     <p>
-      The Service is intended for users 18 years or older; you are not permitted to access or use the Service if you are younger than 18. We do not knowingly collect personal information from children under the age of 18 through the Service. We encourage parents and legal guardians to monitor their children’s Internet usage and to help enforce our Privacy Policy by instructing their children to never provide personal information without their permission. If you have reason to believe that a child under the age of 18 has provided personal information to us, please contact us at <a href="mailto:privacy@habitica.com">privacy@habitica.com</a>, and we will delete that information from our databases.
+      The Service is intended for users 18 years or older; you are not permitted to access or use the Service if you are younger than 18. We do not knowingly collect personal information from children under the age of 18 through the Service. We encourage parents and legal guardians to monitor their children’s Internet usage and to help enforce our Privacy Policy by instructing their children to never provide personal information without their permission. If you have reason to believe that a child under the age of 18 has provided personal information to us, please contact us at <a href='mailto:privacy@habitica.com'>privacy@habitica.com</a>, and we will delete that information from our databases.
     </p>
 
     <h2 id="section_8">
@@ -710,7 +708,7 @@
 
     <p><strong><u>Nevada Residents</u></strong></p>
     <p>
-      Nevada residents may opt out of the sale of certain “covered information” collected by operators of websites or online services. We currently do not sell covered information, as “sale” is defined by such law, and do not have plans to do so. In accordance with Nevada law, you may submit to us a verified request instructing us not to sell your covered information by sending an email to <a href="mailto:privacy@habitica.com">privacy@habitica.com</a>.
+      Nevada residents may opt out of the sale of certain “covered information” collected by operators of websites or online services. We currently do not sell covered information, as “sale” is defined by such law, and do not have plans to do so. In accordance with Nevada law, you may submit to us a verified request instructing us not to sell your covered information by sending an email to <a href='mailto:privacy@habitica.com'>privacy@habitica.com</a>.
     </p>
     <p><strong><u>Notice to United Kingdom/European/Switzerland Residents.</u></strong></p>
     <p>

website/client/src/components/static/staticWrapper.vue

@@ -15,8 +15,8 @@
       <router-view />
     </div>
     <div
-      v-if="loginFlow"
       id="bottom-background"
+      v-if="loginFlow"
       class="bg-purple-300"
     >
       <div class="seamless_mountains_demo_repeat"></div>
@@ -31,10 +31,7 @@
       id="bottom-wrap"
       class="purple-4"
     >
-      <div
-        v-if="!loginFlow"
-        id="bottom-background"
-      >
+      <div id="bottom-background" v-if="!loginFlow">
         <div class="seamless_mountains_demo_repeat"></div>
         <div class="midground_foreground_extended2"></div>
       </div>
@@ -107,10 +104,9 @@
     footer, footer a {
       background: transparent;
       color: $purple-500;
-    }
-
-    footer a:hover {
-      color: $white;
+      &:hover {
+        color: $white;
+      }
     }
 
     h3 {
@@ -121,6 +117,10 @@
       border-top-color: $purple-100;
     }
 
+    .donate-text {
+      color: $purple-500;
+    }
+
     .logo {
       color: $purple-300;
     }
@@ -129,27 +129,42 @@
       color: $purple-500;
     }
 
-    .social .d-flex:hover {
-      a {
-        color: $white;
-      }
-      svg {
-        fill: $white;
-      }
-    }
-
     .social-circle {
       background: $purple-50;
       color: $purple-500;
 
-      svg {
+      .instagram svg {
         background-color: $purple-50;
         fill: $purple-500;
-        width: 24px;
-        height: 24px;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .bluesky svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .facebook svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .tumblr svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
       }
     }
-
     .btn-contribute {
       background: $white;
       box-shadow: none;
@@ -259,8 +274,7 @@ export default {
       return 'purple-footer';
     },
     loginFlow () {
-      const loginRoutes = ['forgotPassword', 'login', 'register', 'resetPassword', 'username'];
-      return loginRoutes.indexOf(this.$route.name) !== -1;
+      return ['login', 'register', 'username'].indexOf(this.$route.name) !== -1;
     },
     showContentWrap () {
       return this.$route.name !== 'news';

website/client/src/components/static/terms.vue

@@ -158,7 +158,7 @@
       BY PURCHASING PREMIUM YOU EXPRESSLY UNDERSTAND AND AGREE TO OUR REFUND POLICY:
     </p>
     <p>
-      YOU CAN REQUEST A REFUND OF YOUR MOST RECENT PAYMENT TO US BY CONTACTING US AT <a href="mailto:admin@habitica.com">ADMIN@HABITICA.COM</a>. THE AMOUNT OF YOUR REFUND, IF ANY, WILL BE BASED ON (1) THE AMOUNT OF YOUR PURCHASED BUT UNUSED SUBSCRIPTION BENEFITS AND (2) THE TERMS IMPOSED ON US BY OUR PAYMENT PROCESSING VENDORS (E.G., WITH RESPECT TO THE DURATION OF THE REFUND PERIOD).
+      YOU CAN REQUEST A REFUND OF YOUR MOST RECENT PAYMENT TO US BY CONTACTING US AT <a href='mailto:admin@habitica.com'>ADMIN@HABITICA.COM</a>. THE AMOUNT OF YOUR REFUND, IF ANY, WILL BE BASED ON (1) THE AMOUNT OF YOUR PURCHASED BUT UNUSED SUBSCRIPTION BENEFITS AND (2) THE TERMS IMPOSED ON US BY OUR PAYMENT PROCESSING VENDORS (E.G., WITH RESPECT TO THE DURATION OF THE REFUND PERIOD).
     </p>
     <p>
       FOR ANY CUSTOMER WHO PURCHASED PREMIUM IN APPLE INC.'s APP STORE ("APP STORE"), PLEASE CONTACT APPLE INC.'s SUPPORT TEAM: <a

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

@@ -1,45 +1,65 @@
 <template>
   <b-modal
     id="broken-task-modal"
+    title="Broken Challenge"
+    size="sm"
     :hide-footer="true"
-    :hide-header="true"
-    modal-class="broken-task-confirm-modal"
-    centered
   >
     <div
       v-if="brokenChallengeTask && brokenChallengeTask.challenge"
-      class="modal-content-wrapper"
+      class="modal-body"
     >
-      <div class="top-bar"></div>
-      <div class="modal-body-content">
-        <div
-          class="icon-wrapper"
-          v-html="icons.alertIcon"
-        ></div>
-        <h2 class="modal-title">
-          {{ modalTitle }}
-        </h2>
-        <p class="modal-subtitle">
-          {{ modalSubtitle }}
-        </p>
-        <div class="button-wrapper">
+      <div
+        v-if="brokenChallengeTask.challenge.broken === 'TASK_DELETED'
+          || brokenChallengeTask.challenge.broken === 'CHALLENGE_TASK_NOT_FOUND'"
+      >
+        <h2>{{ $t('brokenTask') }}</h2>
+        <div>
           <button
             class="btn btn-primary"
-            @click="keepAction()"
+            @click="unlink('keep')"
           >
-            {{ keepButtonText }}
+            {{ $t('keepIt') }}
           </button>
           <button
             class="btn btn-danger"
-            @click="removeAction()"
+            @click="removeTask(obj)"
           >
-            {{ removeButtonText }}
+            {{ $t('removeIt') }}
+          </button>
+        </div>
+      </div>
+      <div v-if="brokenChallengeTask.challenge.broken === 'CHALLENGE_DELETED'">
+        <h2>{{ $t('brokenChallenge') }}</h2>
+        <div>
+          <button
+            class="btn btn-primary"
+            @click="unlink('keep-all')"
+          >
+            {{ $t('keepTasks') }}
           </button>
           <button
-            class="btn-cancel"
-            @click="close()"
+            class="btn btn-danger"
+            @click="unlink('remove-all')"
           >
-            {{ $t('cancel') }}
+            {{ $t('removeTasks') }}
+          </button>
+        </div>
+      </div>
+      <div v-if="brokenChallengeTask.challenge.broken === 'CHALLENGE_CLOSED'">
+        <h2 v-html="$t('challengeCompleted', {user: brokenChallengeTask.challenge.winner})"></h2>
+        <div>
+          <button
+            class="btn btn-primary"
+            @click="unlink('keep-all')"
+          >
+            {{ $t('keepTasks') }}
+          </button>
+          <button
+            class="btn btn-danger"
+            @click="unlink('remove-all')"
+          >
+            {{ $t('removeTasks') }}
           </button>
         </div>
       </div>
@@ -47,175 +67,23 @@
   </b-modal>
 </template>
 
-<style lang="scss" scoped>
-@import '@/assets/scss/colors.scss';
-
-::v-deep .broken-task-confirm-modal {
-  .modal-dialog {
-    max-width: 330px;
-    margin: auto;
-  }
-
-  .modal-content {
-    border-radius: 8px;
-    overflow: hidden;
-    border: none;
-  }
-
+<style scoped>
   .modal-body {
-    padding: 0;
+    padding-bottom: 2em;
   }
-}
-
-.modal-content-wrapper {
-  display: flex;
-  flex-direction: column;
-}
-
-.top-bar {
-  height: 8px;
-  background-color: $maroon-100;
-}
-
-.modal-body-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 0 24px 24px;
-}
-
-.icon-wrapper {
-  margin-top: 40px;
-  width: 48px;
-  height: 48px;
-
-  ::v-deep svg {
-    width: 48px;
-    height: 48px;
-
-    path {
-      fill: #DE3F3F;
-    }
-  }
-}
-
-.modal-title {
-  margin-top: 16px;
-  margin-bottom: 0;
-  color: $maroon-100;
-  font-family: 'Roboto Condensed', sans-serif;
-  font-weight: 700;
-  font-size: 20px;
-  text-align: center;
-}
-
-.modal-subtitle {
-  margin-top: 12px;
-  margin-bottom: 0;
-  font-family: Roboto, sans-serif;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  text-align: center;
-  color: $gray-50;
-}
-
-.button-wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  margin-top: 16px;
-  gap: 8px;
-}
-
-.btn-cancel {
-  background: none;
-  border: none;
-  color: $purple-300;
-  font-family: Roboto, sans-serif;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  cursor: pointer;
-  padding: 8px 16px;
-
-  &:hover {
-    text-decoration: underline;
-  }
-}
 </style>
 
 <script>
 import { mapActions } from '@/libs/store';
 import notifications from '@/mixins/notifications';
-import alertIcon from '@/assets/svg/for-css/alert.svg?raw';
 
 export default {
   mixins: [notifications],
   data () {
     return {
       brokenChallengeTask: {},
-      icons: Object.freeze({
-        alertIcon,
-      }),
     };
   },
-  computed: {
-    brokenType () {
-      return this.brokenChallengeTask.challenge?.broken;
-    },
-    isSingleTask () {
-      return this.brokenType === 'TASK_DELETED'
-        || this.brokenType === 'CHALLENGE_TASK_NOT_FOUND';
-    },
-    brokenChallengeTaskCount () {
-      if (!this.brokenChallengeTask.challenge?.id) return 0;
-      const challengeId = this.brokenChallengeTask.challenge.id;
-      const tasksData = this.$store.state.tasks.data;
-      let count = 0;
-      ['habits', 'dailys', 'todos', 'rewards'].forEach(type => {
-        if (tasksData[type]) {
-          count += tasksData[type].filter(
-            t => t.challenge && t.challenge.id === challengeId,
-          ).length;
-        }
-      });
-      return count;
-    },
-    modalTitle () {
-      if (this.isSingleTask) {
-        return this.$t('brokenTask');
-      }
-      if (this.brokenType === 'CHALLENGE_CLOSED') {
-        return this.$t('challengeCompleted');
-      }
-      return this.$t('brokenChallenge');
-    },
-    modalSubtitle () {
-      if (this.isSingleTask) {
-        return this.$t('brokenTaskDescription');
-      }
-      if (this.brokenType === 'CHALLENGE_CLOSED') {
-        return this.$t('challengeCompletedDescription', { user: this.brokenChallengeTask.challenge?.winner });
-      }
-      return this.$t('brokenChallengeDescription');
-    },
-    keepButtonText () {
-      if (this.isSingleTask) {
-        return this.$t('keepIt');
-      }
-      return this.$t('keepTasks');
-    },
-    removeButtonText () {
-      if (this.isSingleTask) {
-        return this.$t('removeIt');
-      }
-      return this.$t('removeTasks');
-    },
-  },
   mounted () {
     this.$root.$on('handle-broken-task', task => {
       this.brokenChallengeTask = { ...task };
@@ -231,36 +99,8 @@ export default {
       unlinkOneTask: 'tasks:unlinkOneTask',
       unlinkAllTasks: 'tasks:unlinkAllTasks',
     }),
-    keepAction () {
-      if (this.isSingleTask) {
-        this.unlink('keep');
-      } else {
-        this.unlink('keep-all');
-      }
-    },
-    async removeAction () {
-      if (this.isSingleTask) {
-        await this.removeTask();
-      } else {
-        await this.unlink('remove-all');
-      }
-    },
     async unlink (keepOption) {
       if (keepOption.indexOf('-all') !== -1) {
-        if (keepOption === 'remove-all') {
-          const count = this.brokenChallengeTaskCount;
-          const confirmed = await new Promise(resolve => {
-            this.$root.$emit('habitica:delete-task-confirm', {
-              title: count === 1 ? this.$t('deleteTask') : this.$t('deleteXTasks', { count }),
-              description: this.$t('brokenChallengeTaskCount', { count }),
-              message: this.$t('confirmDeleteTasks'),
-              buttonText: count === 1 ? this.$t('deleteTask') : this.$t('deleteXTasks', { count }),
-              resolve,
-            });
-          });
-          if (!confirmed) return;
-        }
-
         await this.unlinkAllTasks({
           challengeId: this.brokenChallengeTask.challenge.id,
           keep: keepOption,
@@ -282,14 +122,8 @@ export default {
       });
       this.close();
     },
-    async removeTask () {
-      const confirmed = await new Promise(resolve => {
-        this.$root.$emit('habitica:delete-task-confirm', {
-          message: this.$t('sureDelete'),
-          resolve,
-        });
-      });
-      if (!confirmed) return;
+    removeTask () {
+      if (!window.confirm('Are you sure you want to delete this task?')) return; // eslint-disable-line no-alert
       this.destroyTask(this.brokenChallengeTask);
       this.close();
     },

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

@@ -87,7 +87,7 @@
         ref="tasksList"
         class="sortable-tasks"
         :disabled="activeFilter.label === 'scheduled' || !canBeDragged()"
-        scroll-sensitivity="64"
+        scrollSensitivity="64"
         :delay-on-touch-only="true"
         :delay="100"
         @update="taskSorted"

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

@@ -1,223 +0,0 @@
-<template>
-  <b-modal
-    id="delete-task-confirm-modal"
-    :hide-footer="true"
-    :hide-header="true"
-    modal-class="delete-confirm-modal"
-    centered
-  >
-    <div class="modal-content-wrapper">
-      <div class="top-bar"></div>
-      <div class="modal-body-content">
-        <div
-          class="icon-wrapper"
-          v-html="icons.alertIcon"
-        ></div>
-        <h2 class="modal-title">
-          {{ displayTitle }}
-        </h2>
-        <p
-          v-if="description"
-          class="modal-description"
-        >
-          {{ description }}
-        </p>
-        <p class="modal-subtitle">
-          {{ confirmationMessage }}
-        </p>
-        <div class="button-wrapper">
-          <button
-            class="btn btn-danger"
-            @click="confirm()"
-          >
-            {{ buttonText }}
-          </button>
-          <button
-            class="btn-cancel"
-            @click="cancel()"
-          >
-            {{ $t('cancel') }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </b-modal>
-</template>
-
-<script>
-import alertIcon from '@/assets/svg/for-css/alert.svg?raw';
-
-export default {
-  data () {
-    return {
-      confirmationMessage: '',
-      taskType: '',
-      description: '',
-      customTitle: '',
-      customButtonText: '',
-      resolveCallback: null,
-      icons: Object.freeze({
-        alertIcon,
-      }),
-    };
-  },
-  computed: {
-    displayTitle () {
-      if (this.customTitle) return this.customTitle;
-      return this.$t('deleteType', { type: this.taskType });
-    },
-    buttonText () {
-      if (this.customButtonText) return this.customButtonText;
-      return this.displayTitle;
-    },
-  },
-  mounted () {
-    this.$root.$on('habitica:delete-task-confirm', config => {
-      this.confirmationMessage = config.message;
-      this.taskType = config.taskType || '';
-      this.description = config.description || '';
-      this.customTitle = config.title || '';
-      this.customButtonText = config.buttonText || '';
-      this.resolveCallback = config.resolve;
-      this.$root.$emit('bv::show::modal', 'delete-task-confirm-modal');
-    });
-  },
-  beforeDestroy () {
-    this.$root.$off('habitica:delete-task-confirm');
-  },
-  methods: {
-    confirm () {
-      if (this.resolveCallback) {
-        this.resolveCallback(true);
-      }
-      this.close();
-    },
-    cancel () {
-      if (this.resolveCallback) {
-        this.resolveCallback(false);
-      }
-      this.close();
-    },
-    close () {
-      this.$root.$emit('bv::hide::modal', 'delete-task-confirm-modal');
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/colors.scss';
-
-::v-deep .delete-confirm-modal {
-  .modal-dialog {
-    max-width: 330px;
-    margin: auto;
-  }
-
-  .modal-content {
-    border-radius: 8px;
-    overflow: hidden;
-    border: none;
-  }
-
-  .modal-body {
-    padding: 0;
-  }
-}
-
-.modal-content-wrapper {
-  display: flex;
-  flex-direction: column;
-}
-
-.top-bar {
-  height: 8px;
-  background-color: $maroon-100;
-}
-
-.modal-body-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 0 24px 24px;
-}
-
-.icon-wrapper {
-  margin-top: 40px;
-  width: 48px;
-  height: 48px;
-
-  ::v-deep svg {
-    width: 48px;
-    height: 48px;
-
-    path {
-      fill: #DE3F3F;
-    }
-  }
-}
-
-.modal-title {
-  margin-top: 16px;
-  margin-bottom: 0;
-  color: $maroon-100;
-  font-family: 'Roboto Condensed', sans-serif;
-  font-weight: 700;
-  font-size: 20px;
-  text-align: center;
-}
-
-.modal-description {
-  margin-top: 12px;
-  margin-bottom: 0;
-  font-family: Roboto, sans-serif;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  text-align: center;
-  color: $gray-50;
-}
-
-.modal-description + .modal-subtitle {
-  margin-top: 16px;
-}
-
-.modal-subtitle {
-  margin-top: 12px;
-  margin-bottom: 0;
-  font-family: Roboto, sans-serif;
-  font-weight: 700;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  text-align: center;
-  color: $gray-50;
-}
-
-.button-wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  margin-top: 16px;
-  gap: 8px;
-}
-
-.btn-cancel {
-  background: none;
-  border: none;
-  color: $purple-300;
-  font-family: Roboto, sans-serif;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  letter-spacing: 0;
-  cursor: pointer;
-  padding: 8px 16px;
-
-  &:hover {
-    text-decoration: underline;
-  }
-}
-</style>

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

@@ -1177,16 +1177,9 @@ export default {
     moveToBottom () {
       this.$emit('moveTo', this.task, 'bottom');
     },
-    async destroy () {
+    destroy () {
       const type = this.$t(this.task.type);
-      const confirmed = await new Promise(resolve => {
-        this.$root.$emit('habitica:delete-task-confirm', {
-          message: this.$t('sureDeleteType', { type }),
-          taskType: type,
-          resolve,
-        });
-      });
-      if (!confirmed) return;
+      if (!window.confirm(this.$t('sureDeleteType', { type }))) return; // eslint-disable-line no-alert
       this.destroyTask(this.task);
       this.$emit('taskDestroyed', this.task);
     },

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

@@ -35,7 +35,7 @@
           </button>
           <button
             class="btn btn-secondary d-flex align-items-center justify-content-center"
-            :class="{'btn-disabled': !canSave}"
+            :class="{disabled: !canSave}"
             type="button"
             @click="submit()"
           >
@@ -150,25 +150,25 @@
           <button
             type="button"
             class="habit-option-container no-transition
-            d-flex flex-column justify-content-center align-items-center"
+              d-flex flex-column justify-content-center align-items-center"
             :class="!task.up ? cssClass('habit-control-disabled') : ''"
             :disabled="challengeAccessRequired"
             @click="toggleUpDirection()"
           >
             <div
               class="habit-option-button no-transition
-              d-flex justify-content-center align-items-center mb-2"
+                d-flex justify-content-center align-items-center mb-2"
               :class="task.up ? cssClass('bg') : ''"
             >
               <div
                 class="habit-option-icon svg-icon no-transition"
-                :class="task.up ? '' : 'icon-disabled'"
+                :class="task.up ? '' : 'disabled'"
                 v-html="icons.positive"
               ></div>
             </div>
             <div
               class="habit-option-label no-transition"
-              :class="task.up ? cssClass('icon') : 'label-disabled'"
+              :class="task.up ? cssClass('icon') : 'disabled'"
             >
               {{ $t('positive') }}
             </div>
@@ -176,25 +176,25 @@
           <button
             type="button"
             class="habit-option-container no-transition
-            d-flex flex-column justify-content-center align-items-center"
+              d-flex flex-column justify-content-center align-items-center"
             :class="!task.down ? cssClass('habit-control-disabled') : ''"
             :disabled="challengeAccessRequired"
             @click="toggleDownDirection()"
           >
             <div
               class="habit-option-button no-transition
-              d-flex justify-content-center align-items-center mb-2"
+                d-flex justify-content-center align-items-center mb-2"
               :class="task.down ? cssClass('bg') : ''"
             >
               <div
                 class="habit-option-icon no-transition svg-icon negative mx-auto"
-                :class="task.down ? '' : 'icon-disabled'"
+                :class="task.down ? '' : 'disabled'"
                 v-html="icons.negative"
               ></div>
             </div>
             <div
               class="habit-option-label no-transition"
-              :class="task.down ? cssClass('icon') : 'label-disabled'"
+              :class="task.down ? cssClass('icon') : 'disabled'"
             >
               {{ $t('negative') }}
             </div>
@@ -382,45 +382,6 @@
             </div>
           </div>
         </div>
-        <div
-          v-if="showStatAssignment"
-          class="stat-assignment option mt-3"
-        >
-          <div class="form-group row">
-            <label
-              v-once
-              class="col-12 mb-1"
-            >{{ $t('assignedStat') }}</label>
-            <div class="col-12">
-              <div class="stat-dropdown-container">
-                <select-list
-                  :items="statOptions"
-                  :value="task.attribute"
-                  key-prop="key"
-                  active-key-prop="key"
-                  @select="task.attribute = $event.key"
-                >
-                  <template #item="{ item, button }">
-                    <div class="stat-option-content">
-                      <span
-                        class="stat-option-title"
-                        :class="item.key"
-                      >
-                        {{ $t(item.label) }}
-                      </span>
-                      <span
-                        v-if="!button"
-                        class="stat-option-description"
-                      >
-                        {{ $t(item.description) }}
-                      </span>
-                    </div>
-                  </template>
-                </select-list>
-              </div>
-            </div>
-          </div>
-        </div>
         <div
           v-if="task.type === 'habit' && !groupId"
           class="option mt-3"
@@ -630,8 +591,8 @@
         >
           <button
             class="btn btn-primary btn-footer
-          d-flex align-items-center justify-content-center"
-            :class="{'btn-disabled': !canSave}"
+            d-flex align-items-center justify-content-center"
+            :class="{disabled: !canSave}"
             type="button"
             @click="submit()"
           >
@@ -920,14 +881,12 @@
       }
     }
 
-    .btn-disabled {
+    .disabled {
       background-color: $white;
       border: 2px solid transparent;
       color: $gray-200;
       line-height: 1.714;
       box-shadow: 0px 1px 3px 0px rgba(26, 24, 29, 0.12), 0px 1px 2px 0px rgba(26, 24, 29, 0.24);
-      cursor: not-allowed;
-      opacity: 0.6;
 
       &:focus {
         background-color: $white;
@@ -950,87 +909,6 @@
   .streak-addon path {
     fill: $gray-200;
   }
-
-  .stat-dropdown-container {
-    .select-list {
-      .selectListItem {
-        margin-bottom: 0;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-      }
-
-      .selectListItem .dropdown-item {
-        padding: 8px 16px !important;
-        height: auto !important;
-        white-space: normal;
-        word-wrap: break-word;
-
-        &:hover,
-        &:focus {
-          background-color: rgba($purple-600, 0.25) !important;
-        }
-      }
-
-      .dropdown-toggle {
-        display: flex;
-        align-items: center;
-
-        .stat-option-content {
-          display: flex;
-          align-items: center;
-
-          .stat-option-title {
-            font-weight: normal;
-            color: $gray-50;
-            margin-bottom: 0;
-          }
-        }
-      }
-    }
-
-    .stat-option-content {
-      display: block;
-      width: 100%;
-
-      .stat-option-title {
-        display: block;
-        font-family: Roboto;
-        font-weight: 700;
-        font-size: 14px;
-        line-height: 1.71;
-        text-transform: capitalize;
-        margin-bottom: 4px;
-
-        &.str {
-          color: $maroon-100;
-        }
-
-        &.int {
-          color: $blue-50;
-        }
-
-        &.con {
-          color: $yellow-5;
-        }
-
-        &.per {
-          color: $purple-300;
-        }
-      }
-
-      .stat-option-description {
-        display: block;
-        font-family: Roboto;
-        font-weight: 400;
-        font-size: 12px;
-        line-height: 16px;
-        color: $gray-100;
-        margin-bottom: 0;
-      }
-    }
-  }
 </style>
 
 <style lang="scss" scoped>
@@ -1070,7 +948,7 @@
       height: 10px;
       color: $white;
 
-      &.icon-disabled {
+      &.disabled {
         color: $gray-200;
       }
 
@@ -1084,7 +962,7 @@
       font-weight: bold;
       text-align: center;
 
-      &.label-disabled {
+      &.disabled {
         color: $gray-100;
         font-weight: normal;
       }
@@ -1140,9 +1018,10 @@
     border: 0;
   }
 
-  .input-group-outer.disabled .input-group-text {
+  .disabled .input-group-text {
     color: $gray-200;
   }
+
 </style>
 
 <script>
@@ -1157,7 +1036,6 @@ import SelectMulti from './modal-controls/selectMulti';
 import selectDifficulty from '@/components/tasks/modal-controls/selectDifficulty';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
-import selectList from '@/components/ui/selectList';
 
 import syncTask from '../../mixins/syncTask';
 
@@ -1181,7 +1059,6 @@ export default {
     selectTranslatedArray,
     toggleCheckbox,
     lockableLabel,
-    selectList,
   },
   directives: {
     markdown: markdownDirective,
@@ -1215,12 +1092,6 @@ export default {
         con: 'constitution',
         per: 'perception',
       },
-      statOptions: [
-        { key: 'str', label: 'strength', description: 'strTaskText' },
-        { key: 'int', label: 'intelligence', description: 'intTaskText' },
-        { key: 'con', label: 'constitution', description: 'conTaskText' },
-        { key: 'per', label: 'perception', description: 'perTaskText' },
-      ],
       calendarHighlights: { dates: [new Date()] },
     };
   },
@@ -1314,12 +1185,6 @@ export default {
     selectedTags () {
       return this.getTagsFor(this.task);
     },
-    showStatAssignment () {
-      return this.task.type !== 'reward'
-        && !this.groupId
-        && this.user.preferences.automaticAllocation === true
-        && this.user.preferences.allocationMode === 'taskbased';
-    },
   },
   watch: {
     task () {
@@ -1438,16 +1303,9 @@ export default {
       }
       this.$root.$emit('bv::hide::modal', 'task-modal');
     },
-    async destroy () {
+    destroy () {
       const type = this.$t(this.task.type);
-      const confirmed = await new Promise(resolve => {
-        this.$root.$emit('habitica:delete-task-confirm', {
-          message: this.$t('sureDeleteType', { type }),
-          taskType: type,
-          resolve,
-        });
-      });
-      if (!confirmed) return;
+      if (!window.confirm(this.$t('sureDeleteType', { type }))) return; // eslint-disable-line no-alert
       this.destroyTask(this.task);
       this.$emit('taskDestroyed', this.task);
       this.$root.$emit('bv::hide::modal', 'task-modal');

website/client/src/components/ui/selectList.vue

@@ -12,7 +12,7 @@
       <template #button-content>
         <slot
           name="item"
-          :item="selectedItem || placeholder"
+          :item="selected || placeholder"
           :button="true"
         >
           <!-- Fallback content -->
@@ -134,14 +134,6 @@ export default {
       }),
     };
   },
-  computed: {
-    selectedItem () {
-      if (this.activeKeyProp) {
-        return this.items.find(item => item[this.activeKeyProp] === this.selected);
-      }
-      return this.items.find(item => item === this.selected);
-    },
-  },
   methods: {
     getKeyProp (item) {
       return this.keyProp ? item[this.keyProp] : item.key || item.identifier;

website/client/src/components/ui/toggleSwitch.vue

@@ -25,8 +25,8 @@
           type="checkbox"
           :checked="isChecked"
           :value="value"
-          :disabled="disabled"
           @change="handleChange"
+          :disabled="disabled"
         >
         <label
           class="toggle-switch-label"
@@ -116,7 +116,7 @@
   .toggle-switch-inner:before {
     content: "";
     padding-left: 10px;
-    background-color: $green-50;
+    background-color: $green-10;
   }
 
   .toggle-switch-inner:after {

website/client/src/components/userMenu/profile.vue

@@ -1126,12 +1126,7 @@ export default {
     this.loadUser();
     this.oldTitle = this.$store.state.title;
     this.handleExternalLinks();
-    // Check if there's a hash in the URL to determine the starting page
-    let pageToSelect = this.startingPage;
-    if (window.location.hash && (window.location.hash === '#stats' || window.location.hash === '#achievements')) {
-      pageToSelect = window.location.hash.substring(1);
-    }
-    this.selectPage(pageToSelect);
+    this.selectPage(this.startingPage);
     this.$root.$on('habitica:report-profile-result', () => {
       this.loadUser();
     });
@@ -1216,15 +1211,10 @@ export default {
     },
     selectPage (page) {
       this.selectedPage = page || 'profile';
-      const profileUserId = this.userId || this.userLoggedIn._id;
-      let newPath = `/profile/${profileUserId}`;
-      if (page !== 'profile') {
-        newPath += `#${page}`;
-      }
-      window.history.replaceState(null, null, newPath);
+      window.history.replaceState(null, null, '');
       this.$store.dispatch('common:setTitle', {
         section: this.$t('user'),
-        subSection: this.$t(page),
+        subSection: this.$t(this.startingPage),
       });
     },
     getNextIncentive () {

website/client/src/libs/analytics.js

@@ -3,10 +3,14 @@ import isEqual from 'lodash/isEqual';
 import keys from 'lodash/keys';
 import pick from 'lodash/pick';
 import amplitude from 'amplitude-js';
+import { gtag, install } from 'ga-gtag';
 import Vue from 'vue';
 import getStore from '@/store';
 
 const AMPLITUDE_KEY = import.meta.env.AMPLITUDE_KEY;
+const DEBUG_ENABLED = import.meta.env.DEBUG_ENABLED === 'true';
+const GA_ID = import.meta.env.GA_ID;
+const IS_PRODUCTION = import.meta.env.NODE_ENV === 'production';
 const REQUIRED_FIELDS = ['eventCategory', 'eventAction'];
 
 let analyticsLoading = false;
@@ -15,7 +19,7 @@ let analyticsReady = false;
 function _getConsentedUser () {
   const store = getStore();
   const user = store.state.user.data;
-  if (!user?.preferences?.analyticsConsent) {
+  if (!user?.preferences?.analyticsConsent || navigator.globalPrivacyControl) {
     return false;
   }
   return user;
@@ -65,6 +69,10 @@ function _gatherUserStats (properties) {
 export function safeSetup (userId) {
   if (analyticsLoading || analyticsReady) return;
   analyticsLoading = true;
+  install(GA_ID, {
+    debug_mode: DEBUG_ENABLED || !IS_PRODUCTION,
+    user_id: userId,
+  });
   amplitude.getInstance().init(AMPLITUDE_KEY, userId);
   analyticsReady = true;
   analyticsLoading = false;
@@ -82,6 +90,7 @@ export function track (properties, options = {}) {
     // Track events on the server by default
     if (trackOnClient === true) {
       amplitude.getInstance().logEvent(properties.eventAction, properties);
+      gtag('event', properties.eventAction, properties);
     } else {
       const store = getStore();
       store.dispatch('analytics:trackEvent', properties);
@@ -96,6 +105,7 @@ export function updateUser (properties = {}) {
   // Use nextTick to avoid blocking the UI
   Vue.nextTick(() => {
     _gatherUserStats(properties);
+    gtag('set', 'user_properties', properties);
     forEach(properties, (value, key) => {
       const identify = new amplitude.Identify().set(key, value);
       amplitude.getInstance().identify(identify);

website/client/src/libs/renderWithMentions.js

@@ -1,16 +1,7 @@
 import habiticaMarkdown from 'habitica-markdown/withMentions';
-import escapeRegExp from 'lodash/escapeRegExp';
 
 export default function renderWithMentions (text, user) {
   if (!text) return null;
-  const env = { userName: user.auth.local.username };
-  let html = habiticaMarkdown.render(String(text), env);
-
-  if (user.auth.local.username) {
-    const username = escapeRegExp(user.auth.local.username);
-    const regex = new RegExp(`(<span class="at-text">@)(${username})(</span>)`, 'gi');
-    html = html.replace(regex, (match, p1, p2, p3) => `${p1.replace('at-text', 'at-text at-highlight')}${p2}${p3}`);
-  }
-
-  return html;
+  const env = { userName: user.auth.local.username, displayName: user.profile.name };
+  return habiticaMarkdown.render(String(text), env);
 }

website/client/src/libs/staffList.js

@@ -30,8 +30,8 @@ export default [
     uuid: '61b2c855-0a30-444c-bcc6-1cac876460b0',
   },
   {
-    name: 'fizself',
+    name: 'heyeilatan',
     type: 'Staff',
-    uuid: 'e39ea3eb-28d2-48da-8568-7a5b0e64498e',
+    uuid: 'f4e5c6da-0617-48bf-b3bd-9f97636774a8',
   },
 ];

website/client/src/mixins/buy.js

@@ -39,15 +39,7 @@ export default {
       };
 
       const purchaseForKey = currencyToPurchaseForKey[currency];
-
-      return new Promise(resolve => {
-        this.$root.$emit('habitica:purchase-confirm', {
-          message: this.$t(purchaseForKey, { cost }),
-          currency,
-          cost,
-          resolve,
-        });
-      });
+      return window.confirm(this.$t(purchaseForKey, { cost })); // eslint-disable-line no-alert
     },
   },
 };

website/client/src/pages/settings-overview.vue

@@ -98,7 +98,7 @@
   }
 
   .settings-content {
-    flex: 0 0 751px;
+    flex: 0 0 732px;
     max-width: unset;
 
     ::v-deep {

website/client/src/pages/settings/settingRows/classSetting.vue

@@ -217,18 +217,8 @@ export default {
       }
     },
     async changeClassAndClose () {
-      if (!this.classDisabled) {
-        const confirmed = await new Promise(resolve => {
-          this.$root.$emit('habitica:purchase-confirm', {
-            message: this.$t('changeClassConfirmCost'),
-            currency: 'gems',
-            cost: 3,
-            resolve,
-          });
-        });
-        if (!confirmed) {
-          return;
-        }
+      if (!this.classDisabled && !window.confirm(this.$t('changeClassConfirmCost'))) {
+        return;
       }
 
       this.$root.$once('bv::hide::modal', () => {

website/client/src/pages/settings/siteDataRows/privacyPreferencesRow.vue

@@ -1,8 +1,7 @@
 <template>
   <tr>
-    <td
+    <td colspan="3"
       v-if="!mixinData.inlineSettingMixin.modalVisible"
-      colspan="3"
     >
       <div class="d-flex justify-content-between align-items-center">
         <h3
@@ -19,9 +18,8 @@
         </a>
       </div>
     </td>
-    <td
+    <td colspan="3"
       v-if="mixinData.inlineSettingMixin.modalVisible"
-      colspan="3"
     >
       <h3
         v-once
@@ -35,21 +33,6 @@
         v-html="$t('privacySettingsOverview') + ' ' + $t('learnMorePrivacy')"
       >
       </p>
-      <div
-        v-if="gpcEnabled"
-        class="mx-4 px-3 py-2 mb-4 gpc-alert d-flex align-items-center black bg-yellow-50"
-      >
-        <div
-          class="svg svg-icon mr-2"
-          v-html="icons.alert"
-        >
-        </div>
-        <div
-          class="gpc-message"
-          v-html="gpcInfo"
-        >
-        </div>
-      </div>
       <div
         class="d-flex justify-content-center"
       >
@@ -61,8 +44,8 @@
               {{ $t('performanceAnalytics') }}
             </label>
             <toggle-switch
-              v-model="user.preferences.analyticsConsent"
               class="mb-auto"
+              v-model="user.preferences.analyticsConsent"
               @change="prefToggled()"
             />
           </div>
@@ -108,29 +91,6 @@
     line-height: 1.33;
   }
 
-  .gpc-alert {
-    border-radius: 4px;
-    line-height: 1.714;
-
-    .gpc-message {
-      opacity: 0.9;
-    }
-
-    ::v-deep a {
-      color: $black;
-      text-decoration: underline;
-    }
-
-    .svg-icon {
-      width: 16px;
-      opacity: 0.75;
-
-      ::v-deep svg path {
-        fill: $black;
-      }
-    }
-  }
-
   .mb-28p {
     margin-bottom: 28px;
   }
@@ -150,43 +110,24 @@ import ToggleSwitch from '@/components/ui/toggleSwitch.vue';
 import { GenericUserPreferencesMixin } from '@/pages/settings/components/genericUserPreferencesMixin';
 import { InlineSettingMixin } from '../components/inlineSettingMixin';
 import { mapState } from '@/libs/store';
-import alert from '@/assets/svg/for-css/alert.svg?raw';
 
 export default {
-  components: {
-    SaveCancelButtons,
-    ToggleSwitch,
-  },
   mixins: [
     GenericUserPreferencesMixin,
     InlineSettingMixin,
   ],
-  data () {
-    return {
-      icons: Object.freeze({
-        alert,
-      }),
-    };
+  components: {
+    SaveCancelButtons,
+    ToggleSwitch,
   },
   computed: {
     ...mapState({
       user: 'user.data',
     }),
-    gpcEnabled () {
-      return navigator.globalPrivacyControl;
-    },
-    gpcInfo () {
-      const gpcUrl = 'https://globalprivacycontrol.org/';
-      if (this.user.preferences.analyticsConsent) {
-        return this.$t('gpcPlusAnalytics', { url: gpcUrl });
-      }
-      return this.$t('gpcWarning', { url: gpcUrl });
-    },
   },
   methods: {
     finalize () {
       this.setUserPreference('analyticsConsent');
-      localStorage.setItem('analyticsConsent', this.user.preferences.analyticsConsent);
       this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues = false;
     },
     prefToggled () {
@@ -194,10 +135,7 @@ export default {
       this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues = newVal;
     },
     resetControls () {
-      if (this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues) {
-        this.user.preferences.analyticsConsent = !this.user.preferences.analyticsConsent;
-        this.mixinData.inlineSettingMixin.sharedState.inlineSettingUnsavedValues = false;
-      }
+      this.user.preferences.analyticsConsent = !this.user.preferences.analyticsConsent;
     },
   },
 };

website/client/src/pages/user-main.vue

@@ -14,8 +14,6 @@
     <bug-report-success-modal v-if="isUserLoaded" />
     <external-link-modal />
     <birthday-modal />
-    <purchase-confirm-modal v-if="isUserLoaded" />
-    <delete-task-confirm-modal v-if="isUserLoaded" />
     <template v-if="isUserLoaded">
       <privacy-banner />
       <chat-banner />
@@ -140,8 +138,6 @@ import paymentsSuccessModal from '@/components/payments/successModal';
 import subCancelModalConfirm from '@/components/payments/cancelModalConfirm';
 import subCanceledModal from '@/components/payments/canceledModal';
 import externalLinkModal from '@/components/externalLinkModal.vue';
-import purchaseConfirmModal from '@/components/shops/purchaseConfirmModal.vue';
-import deleteTaskConfirmModal from '@/components/tasks/deleteTaskConfirmModal.vue';
 
 import spellsMixin from '@/mixins/spells';
 import {
@@ -176,8 +172,6 @@ export default {
     bugReportModal,
     bugReportSuccessModal,
     externalLinkModal,
-    purchaseConfirmModal,
-    deleteTaskConfirmModal,
   },
   mixins: [notifications, spellsMixin],
   data () {
@@ -269,12 +263,11 @@ export default {
       this.$store.dispatch('tasks:fetchUserTasks'),
     ]).then(() => {
       this.$store.state.isUserLoaded = true;
-      let analyticsConsent = localStorage.getItem('analyticsConsent');
-      if (analyticsConsent !== null) {
-        analyticsConsent = analyticsConsent === 'true';
-        if (analyticsConsent !== this.user.preferences.analyticsConsent) {
-          this.$store.dispatch('user:set', { 'preferences.analyticsConsent': analyticsConsent });
-        }
+      const analyticsConsent = localStorage.getItem('analyticsConsent');
+      if (analyticsConsent !== null
+        && analyticsConsent !== this.user.preferences.analyticsConsent
+      ) {
+        this.$store.dispatch('user:set', { 'preferences.analyticsConsent': analyticsConsent });
       }
       if (window && window['habitica-i18n']) {
         if (this.user.preferences.language === window['habitica-i18n'].language.code) {

website/client/src/router/index.js

@@ -11,6 +11,7 @@ import { DEPRECATED_ROUTES } from '@/router/deprecated-routes';
 
 // NOTE: when adding a page make sure to implement the `common:setTitle` action
 
+const RegisterLoginReset = () => import(/* webpackChunkName: "auth" */'@/components/auth/registerLoginReset');
 const Logout = () => import(/* webpackChunkName: "auth" */'@/components/auth/logout');
 
 // Hall
@@ -23,8 +24,6 @@ const AdminContainerPage = () => import(/* webpackChunkName: "admin-panel" */'@/
 const AdminPanelPage = () => import(/* webpackChunkName: "admin-panel" */'@/components/admin/admin-panel');
 const AdminPanelUserPage = () => import(/* webpackChunkName: "admin-panel" */'@/components/admin/admin-panel/user-support');
 const AdminPanelSearchPage = () => import(/* webpackChunkName: "admin-panel" */'@/components/admin/admin-panel/search');
-const GroupAdminPage = () => import(/* webpackChunkName: "admin-panel" */'@/components/admin/groups');
-const GroupAdminGroupPage = () => import(/* webpackChunkName: "admin-panel" */'@/components/admin/groups/group-support');
 const BlockerPage = () => import(/* webpackChunkName: "admin-panel" */'@/components/admin/blocker');
 
 // Tasks
@@ -78,15 +77,17 @@ const router = new VueRouter({
   // in the route component to set a specific subtitle for the page.
   routes: [
     { name: 'logout', path: '/logout', component: Logout },
+    {
+      name: 'resetPassword', path: '/reset-password', component: RegisterLoginReset, meta: { requiresLogin: false },
+    }, {
+      name: 'forgotPassword', path: '/forgot-password', component: RegisterLoginReset, meta: { requiresLogin: false },
+    },
     { name: 'tasks', path: '/', component: UserTasks },
     {
       name: 'userProfile',
       path: '/profile/:userId',
       props: true,
     },
-    { name: 'profile', path: '/user/profile' },
-    { name: 'stats', path: '/user/stats' },
-    { name: 'achievements', path: '/user/achievements' },
     {
       path: '/inventory',
       component: InventoryContainer,
@@ -215,28 +216,6 @@ const router = new VueRouter({
             },
           ],
         },
-        {
-          name: 'groupAdmin',
-          path: 'groups',
-          component: GroupAdminPage,
-          meta: {
-            privilegeNeeded: [ // any one of these is enough to give access
-              'groupSupport',
-            ],
-          },
-          children: [
-            {
-              name: 'groupAdminGroup',
-              path: ':groupId',
-              component: GroupAdminGroupPage,
-              meta: {
-                privilegeNeeded: [
-                  'groupsSupport',
-                ],
-              },
-            },
-          ],
-        },
         {
           name: 'blockers',
           path: 'blockers',
@@ -366,10 +345,6 @@ router.beforeEach(async (to, from, next) => {
     if (to.params.startingPage !== undefined) {
       startingPage = to.params.startingPage;
     }
-    // Check if there's a hash in the URL for stats or achievements
-    if (to.hash === '#stats' || to.hash === '#achievements') {
-      startingPage = to.hash.substring(1);
-    }
     if (from.name === null) {
       store.state.postLoadModal = `profile/${to.params.userId}`;
       return next({ name: 'tasks' });
@@ -390,18 +365,10 @@ router.beforeEach(async (to, from, next) => {
   }
 
   if ((to.name === 'stats' || to.name === 'achievements' || to.name === 'profile') && from.name !== null) {
-    const userId = store.state.user.data._id;
-    let redirectPath = `/profile/${userId}`;
-    if (to.name === 'stats') {
-      redirectPath += '#stats';
-    } else if (to.name === 'achievements') {
-      redirectPath += '#achievements';
-    }
     router.app.$emit('habitica:show-profile', {
-      userId,
       startingPage: to.name,
       fromPath: from.path,
-      toPath: redirectPath,
+      toPath: to.path,
     });
     return null;
   }

website/client/src/router/static-routes.js

@@ -57,9 +57,6 @@ export const STATIC_ROUTES = {
     {
       name: 'features', path: 'features', component: FeaturesPage, meta: { requiresLogin: false },
     },
-    {
-      name: 'forgotPassword', path: '/forgot-password', component: RegisterLoginReset, meta: { requiresLogin: false },
-    },
     {
       name: 'front', path: 'front', component: HomePage, meta: { requiresLogin: false },
     },
@@ -93,9 +90,6 @@ export const STATIC_ROUTES = {
     {
       name: 'register', path: '/register', component: RegisterLoginReset, meta: { requiresLogin: false },
     },
-    {
-      name: 'resetPassword', path: '/reset-password', component: RegisterLoginReset, meta: { requiresLogin: false },
-    },
     {
       name: 'terms', path: 'terms', component: TermsPage, meta: { requiresLogin: false },
     },

website/client/src/store/actions/admin.js

@@ -1,31 +0,0 @@
-import axios from 'axios';
-
-export async function searchUsers (store, payload) {
-  const url = `/api/v4/admin/search/${payload.userIdentifier}`;
-  const response = await axios.get(url);
-  return response.data.data;
-}
-
-export async function getUserHistory (store, payload) {
-  const url = `/api/v4/admin/user/${payload.userIdentifier}/history`;
-  const response = await axios.get(url);
-  return response.data.data;
-}
-
-export async function getSubscriptionPaymentDetails (store, payload) {
-  const url = `/api/v4/admin/user/${payload.userIdentifier}/subscription-payment-details`;
-  const response = await axios.get(url);
-  return response.data.data;
-}
-
-export async function getGroup (store, payload) {
-  const url = `/api/v4/admin/groups/${payload.groupId}`;
-  const response = await axios.get(url);
-  return response.data.data;
-}
-
-export async function updateGroup (store, payload) {
-  const url = `/api/v4/admin/groups/${payload.groupId || payload.group._id}`;
-  const response = await axios.put(url, payload.group);
-  return response.data.data;
-}

website/client/src/store/actions/adminPanel.js

@@ -0,0 +1,13 @@
+import axios from 'axios';
+
+export async function searchUsers (store, payload) {
+  const url = `/api/v4/admin/search/${payload.userIdentifier}`;
+  const response = await axios.get(url);
+  return response.data.data;
+}
+
+export async function getUserHistory (store, payload) {
+  const url = `/api/v4/admin/user/${payload.userIdentifier}/history`;
+  const response = await axios.get(url);
+  return response.data.data;
+}

website/client/src/store/actions/auth.js

@@ -1,6 +1,8 @@
 import axios from 'axios';
 import { authAsCredentialsState, LOCALSTORAGE_AUTH_KEY } from '@/libs/auth';
 
+const GA_ID = import.meta.env.GA_ID;
+
 function saveLocalDataAuth (store, apiId, apiToken) {
   const credentialsObj = {
     auth: {
@@ -121,6 +123,9 @@ export async function appleAuth (store, params) {
 export function logout (store, options = {}) {
   localStorage.clear();
   sessionStorage.clear();
+  if (window.gtag) {
+    window.gtag('config', GA_ID, { user_id: null });
+  }
   const query = options.redirectToLogin === true ? '?redirectToLogin=true' : '';
   window.location.href = `/logout-server${query}`;
 }

website/client/src/store/actions/hall.js

@@ -38,9 +38,3 @@ export async function getHeroGroupPlans (store, payload) {
   const response = await axios.get(url);
   return response.data.data;
 }
-
-export async function deleteHero (store, payload) {
-  const url = `/api/v4/members/${payload.uuid}?deleteAccount=${payload.deleteHabiticaAccount}&deleteAmplitude=${payload.deleteAmplitudeData}`;
-  const response = await axios.delete(url);
-  return response.data.data;
-}

website/client/src/store/actions/index.js

@@ -1,6 +1,6 @@
 import { flattenAndNamespace } from '@/libs/store/helpers/internals';
 
-import * as admin from './admin';
+import * as adminPanel from './adminPanel';
 import * as common from './common';
 import * as user from './user';
 import * as tasks from './tasks';
@@ -26,7 +26,7 @@ import * as blockers from './blockers';
 // Example: fetch in user.js -> 'user:fetch'
 
 const actions = flattenAndNamespace({
-  admin,
+  adminPanel,
   common,
   user,
   tasks,

website/client/tests/unit/libs/renderWithMentions.spec.js

@@ -12,12 +12,12 @@ describe('renderWithMentions', () => {
     expect(result).to.be.null;
   });
 
-  test('does not highlight displayname to prevent impersonation', () => {
+  test('highlights displayname', () => {
     const text = 'hello @displayedUser with text after';
 
     const result = renderMarkdown(text, user('user', 'displayedUser'));
-    expect(result).to.contain('<span class="at-text">@displayedUser</span>');
-    expect(result).to.not.contain('<span class="at-text at-highlight">@displayedUser</span>');
+
+    expect(result).to.contain('<span class="at-text at-highlight">@displayedUser</span>');
   });
 
   test('highlights username', () => {
@@ -56,8 +56,7 @@ describe('renderWithMentions', () => {
 
     const result = renderMarkdown(plainText, user('use', 'mentions'));
 
-    expect(result).to.contain('<span class="at-text">@mentions</span>');
-    expect(result).to.not.contain('<span class="at-text at-highlight">@mentions</span>');
+    expect(result).to.contain('<span class="at-text at-highlight">@mentions</span>');
     expect(result).to.contain('<span class="at-text at-highlight">@use</span>');
     expect(result).to.contain('<span class="at-text">@mail</span>');
     expect(result).to.not.contain('<span class="at-text at-highlight">@mentions</span>.com');

website/client/vite.config.mjs

@@ -26,6 +26,7 @@ const envVars = [
   'EMAILS_COMMUNITY_MANAGER_EMAIL',
   'EMAILS_TECH_ASSISTANCE_EMAIL',
   'EMAILS_PRESS_ENQUIRY_EMAIL',
+  'GA_ID',
   'STRIPE_PUB_KEY',
   'GOOGLE_CLIENT_ID',
   'APPLE_AUTH_CLIENT_ID',
@@ -35,7 +36,7 @@ const envVars = [
   'TIME_TRAVEL_ENABLED',
   'DEBUG_ENABLED',
   'CONTENT_SWITCHOVER_TIME_OFFSET',
-  'PLAY_CONSOLE_ORDERS_BASE_URL',
+  // TODO necessary? if yes how not to mess up with vue cli? 'NODE_ENV'
 ];
 
 const envObject = {};

website/common/locales/bg/achievements.json

@@ -1,5 +1,5 @@
 {
-    "achievement": "Постижение",
+    "achievement": "Достижения",
     "onwards": "Напред!",
     "levelup": "Изпълнявайки целите си в истинския живот, Вие се качихте ниво и здравето Ви беше запълнено!",
     "reachedLevel": "Достигнахте Ниво <%= level %>",
@@ -106,25 +106,5 @@
     "achievementSeasonalSpecialist": "Сезонен експерт",
     "achievementRedLetterDayText": "Са събрали всички Червени животни.",
     "achievementSeeingRedModalText": "Събрали сте всички Червени любимци!",
-    "achievementSkeletonCrewText": "Събрали са всички Скелетни животни.",
-    "achievementVioletsAreBlueText": "Събра всички сини пет-ове Памучен бонбон.",
-    "achievementWildBlueYonderModalText": "Ти укроти всички маунт-ове Памучен бонбон синьо!",
-    "achievementWildBlueYonderText": "Укроти всички маунт-ове Памучен бонбон синьо.",
-    "achievementVioletsAreBlue": "Розите са червени, Теменужките са сини",
-    "achievementVioletsAreBlueModalText": "Ти събра (или колекционира) всички домашни любимци (или пет-ове) от серията Памучен бонбон синьо!",
-    "achievementWildBlueYonder": "Дивото синьо небе",
-    "achievementSeasonalSpecialistText": "Завърши всички сезонни куестове от пролетта и зимата: Лов на яйца (Egg Hunt), Дядо Коледа-ловец (Trapper Santa) и Намери мечето (Find the Cub)!",
-    "achievementSeasonalSpecialistModalText": "Вие завършихте всичките сезонни куестове!",
-    "achievementDomesticatedModalText": "Ти събра (или колекционира) всички опитомени домашни любимци (пет-ове)!",
-    "achievementDomesticatedText": "Излюпи (или Отгледа) всички стандартни цветове на опитомени домашни любимци (пет-ове): пор, морско свинче, петел, летящо прасе), плъх, заек, кон и крава!",
-    "achievementShadyCustomerText": "Събра всички пет-ове Сянка.",
-    "achievementShadyCustomerModalText": "Събра всички пет-ове Сянка.",
-    "achievementShadyCustomer": "Сенчест тип",
-    "achievementDomesticated": "И-Я–И–Я–ЙО",
-    "achievementZodiacZookeeper": "Пазител на Зодиака",
-    "achievementShadeOfItAll": "В сянката на света",
-    "achievementShadeOfItAllText": "Опитоми всички сенчести коне.",
-    "achievementZodiacZookeeperText": "Излюпи всички стандартни животни(базов цвят) от зодиака: Плъх, Крава, Заек, Змия, Овца, Маймуна, Кокошка, Вълк, Тигър, Летящо прасе, и Дракон!",
-    "achievementZodiacZookeeperModalText": "Събрахте всички животни от зодиака!",
-    "achievementBirdsOfAFeather": "От една порода"
+    "achievementSkeletonCrewText": "Събрали са всички Скелетни животни."
 }

website/common/locales/bg/challenge.json

@@ -2,6 +2,7 @@
     "challenge": "Предизвикателство",
     "challengeDetails": "Предизвикателствата са обществени събития, в които играчите се състезават и печелят награди като изпълняват няколко свързани по някакъв начин задачи.",
     "brokenChaLink": "Повредена връзка на предизвикателство",
+    "brokenTask": "Повредена връзка на предизвикателство: тази задача е била част от предизвикателство, но е била премахната от него. Какво бихте искали да направите?",
     "keepIt": "Запазване",
     "removeIt": "Премахване",
     "brokenChallenge": "Повредена връзка на предизвикателство: тази задача е била част от предизвикателство, но то (или групата) е било изтрито. Какво бихте искали да направите с останалите задачи?",

website/common/locales/bg/npc.json

@@ -88,6 +88,7 @@
     "success": "Готово!",
     "classGear": "Снаряжение за класа",
     "classGearText": "Поздравления за избора на клас! Добавих новата Ви основна екипировка в инвентара Ви. Погледнете по-долу, за да я екипирате!",
+    "autoAllocate": "Автоматично разпределяне",
     "spells": "Умения",
     "skillsTitle": "Умения",
     "toDo": "Задача",

website/common/locales/cs/challenge.json

@@ -2,6 +2,7 @@
     "challenge": "Výzva",
     "challengeDetails": "Výzvy jsou komunitní události, ve kterých hráči soutěží a získávají odměny za plnění úkolů.",
     "brokenChaLink": "Nefunkční odkaz na výzvu",
+    "brokenTask": "Nefunkční odkaz na výzvu: tento úkol byl součástí výzvy, ale byl z ní odstraněn. Co chceš dělat?",
     "keepIt": "Ponechat",
     "removeIt": "Odstranit",
     "brokenChallenge": "Nefunkční odkaz na výzvu: tento úkol byl součástí výzvy, ale ta (nebo skupina, která ji vytvořila) byla odstraněna. Co chceš dělat s osiřelými úkoly?",