From 941194b7c7d4bce8dfdc099aea39add22aa571f0 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 29 Aug 2023 16:59:05 -0400 Subject: [PATCH 01/19] feat(content): add September pet quest bundle --- website/common/script/content/bundles.js | 4 ++-- website/common/script/content/constants/events.js | 6 +++++- website/common/script/content/shop-featuredItems.js | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js index 2d0d90935ac..447e2aea20a 100644 --- a/website/common/script/content/bundles.js +++ b/website/common/script/content/bundles.js @@ -18,9 +18,9 @@ const bundles = { 'harpy', 'owl', ], - event: EVENTS.potions202105, + event: EVENTS.bundle202309, canBuy () { - return moment().isBefore(EVENTS.potions202105.end); + return moment().isBetween(EVENTS.bundle202309.start, EVENTS.bundle202309.end); }, type: 'quests', class: 'quest_bundle_featheredFriends', diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index 41dafd0ad21..9b8cd58ac9b 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -11,10 +11,14 @@ const gemsPromo = { export const EVENTS = { noEvent: { start: '2023-08-01T23:59-04:00', - end: '2023-08-10T08:00-04:00', + end: '2023-09-12T08:00-04:00', season: 'normal', npcImageSuffix: '', }, + bundle202309: { + start: '2023-09-12T08:00-04:00', + end: '2023-09-30T23:59-04:00', + }, bundle202308: { start: '2023-08-15T08:00-04:00', end: '2023-08-31T23:59-04:00', diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 3219ce95928..c26b0604a1a 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -45,19 +45,19 @@ const featuredItems = { ]; }, quests () { - if (moment().isBetween(EVENTS.bundle202308.start, EVENTS.bundle202308.end)) { + if (moment().isBetween(EVENTS.bundle202309.start, EVENTS.bundle202309.end)) { return [ { type: 'bundles', - path: 'bundles.hugabug', + path: 'bundles.featheredFriends', }, { type: 'quests', - path: 'quests.octopus', + path: 'quests.pterodactyl', }, { type: 'quests', - path: 'quests.rock', + path: 'quests.trex', }, ]; } From 08d71cc0bbeb4b6a1081ee16cad4500f2da25614 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 5 Sep 2023 13:30:26 -0500 Subject: [PATCH 02/19] 5.4.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7cb0f99df8..29e1802e11a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "5.3.0", + "version": "5.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f5142dd9395..91ceeff32db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "5.3.0", + "version": "5.4.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.22.5", From ce70c73d499f330c3be440fde27e206d791ad58a Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 12 Sep 2023 09:45:40 -0500 Subject: [PATCH 03/19] fix(test): temporarily use real timer --- test/common/ops/buy/purchase.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index fa5f7c5473b..ce38b4b7e5d 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -197,7 +197,7 @@ describe('shared.ops.purchase', () => { it('purchases quest bundles', async () => { const startingBalance = user.balance; - const clock = sandbox.useFakeTimers(moment('2019-05-20').valueOf()); + // const clock = sandbox.useFakeTimers(moment('2019-05-20').valueOf()); const type = 'bundles'; const key = 'featheredFriends'; const price = 1.75; From 9e253601020e50021347577766738778e19c72ca Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 12 Sep 2023 09:46:28 -0500 Subject: [PATCH 04/19] 5.4.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 29e1802e11a..7d59c1519d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "5.4.0", + "version": "5.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 91ceeff32db..5626831c92e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "5.4.0", + "version": "5.4.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.22.5", From f72eef6bff72bc3414f61d6b5d99fff7cc70f141 Mon Sep 17 00:00:00 2001 From: Natalie <78037386+CuriousMagpie@users.noreply.github.com> Date: Wed, 20 Sep 2023 20:46:34 -0400 Subject: [PATCH 05/19] feat(content): prebuild Fall Festival (#14869) * feat(content): prebuild Fall Festival * fix(typos): because 2023 is not the same as 2024 * feat(css): having stylesheets is important * feat(content): ready for review & testing * fix(tests): account for Sept 09 bundle * fix(gala): use multi event list more fix a couple of strings too * feat(content): Warrior and Rogue text also fix timing of quest bundle feature * fix(strings): correct stat boosts * fix(content): missing mage also adds missing margin to purchase gems button in buy modal --------- Co-authored-by: SabreCat --- habitica-images | 2 +- test/common/ops/buy/purchase.js | 2 +- .../assets/css/sprites/spritesmith-main.css | 726 +++++++++++------- .../src/components/payments/buyGemsModal.vue | 10 +- .../client/src/components/shops/buyModal.vue | 2 +- .../src/components/shops/seasonal/index.vue | 6 +- .../components/shops/timeTravelers/index.vue | 6 +- website/common/locales/en/gear.json | 34 + website/common/locales/en/limited.json | 6 +- .../common/script/content/appearance/sets.js | 4 +- website/common/script/content/bundles.js | 5 +- .../common/script/content/constants/events.js | 19 +- .../script/content/constants/seasonalSets.js | 5 + .../script/content/gear/sets/special/index.js | 62 ++ .../common/script/content/hatching-potions.js | 22 +- .../script/content/shop-featuredItems.js | 40 +- website/common/script/content/spells.js | 2 +- .../script/libs/shops-seasonal.config.js | 14 +- 18 files changed, 628 insertions(+), 339 deletions(-) diff --git a/habitica-images b/habitica-images index 69724d88ef6..6968ddc8457 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 69724d88ef6a4be85104fb08ae1e3d0a3f649765 +Subproject commit 6968ddc845701755fbd67013e586128b03d051f7 diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index ce38b4b7e5d..798cf63c3a1 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -216,7 +216,7 @@ describe('shared.ops.purchase', () => { expect(user.balance).to.equal(startingBalance - price); expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true); - clock.restore(); + // clock.restore(); }); }); diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 2f5f207a244..35f6d0eb41f 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -23760,6 +23760,26 @@ width: 114px; height: 90px; } +.broad_armor_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.broad_armor_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.broad_armor_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.broad_armor_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .broad_armor_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fallHealer.png'); width: 90px; @@ -23950,6 +23970,26 @@ width: 114px; height: 90px; } +.head_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.head_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.head_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.head_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .head_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fallHealer.png'); width: 90px; @@ -24090,6 +24130,21 @@ width: 114px; height: 90px; } +.shield_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.shield_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.shield_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .shield_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fallHealer.png'); width: 90px; @@ -24265,6 +24320,26 @@ width: 68px; height: 68px; } +.shop_armor_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_armor_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Mage.png'); + width: 68px; + height: 68px; +} +.shop_armor_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} +.shop_armor_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .shop_armor_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fallHealer.png'); width: 68px; @@ -24455,6 +24530,21 @@ width: 68px; height: 68px; } +.shop_head_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_head_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Mage.png'); + width: 68px; + height: 68px; +} +.shop_head_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .shop_head_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fallHealer.png'); width: 68px; @@ -24595,6 +24685,21 @@ width: 68px; height: 68px; } +.shop_shield_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_shield_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} +.shop_shield_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .shop_shield_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fallHealer.png'); width: 68px; @@ -24770,6 +24875,16 @@ width: 68px; height: 68px; } +.shop_weapon_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Healer.png'); + width: 68px; + height: 68px; +} +.shop_weapon_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} .shop_weapon_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fallHealer.png'); width: 68px; @@ -24790,6 +24905,21 @@ width: 68px; height: 68px; } +.shop_head_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2023Rogue.png'); + width: 68px; + height: 68px; +} +.shop_weapon_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Mage.png'); + width: 68px; + height: 68px; +} +.shop_weapon_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2023Warrior.png'); + width: 68px; + height: 68px; +} .slim_armor_special_fall2015Healer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2015Healer.png'); width: 93px; @@ -24950,6 +25080,26 @@ width: 114px; height: 90px; } +.slim_armor_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.slim_armor_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.slim_armor_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.slim_armor_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .slim_armor_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fallHealer.png'); width: 90px; @@ -25130,6 +25280,26 @@ width: 114px; height: 90px; } +.weapon_special_fall2023Healer { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Healer.png'); + width: 114px; + height: 90px; +} +.weapon_special_fall2023Mage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Mage.png'); + width: 114px; + height: 90px; +} +.weapon_special_fall2023Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Rogue.png'); + width: 114px; + height: 90px; +} +.weapon_special_fall2023Warrior { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2023Warrior.png'); + width: 114px; + height: 90px; +} .weapon_special_fallHealer { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fallHealer.png'); width: 90px; @@ -34474,334 +34644,126 @@ width: 68px; height: 68px; } -.headAccessory_special_bearEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); +.head_0 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_bearEars { +.customize-option.head_0 { background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png'); width: 60px; height: 60px; } -.headAccessory_special_blackHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png'); - width: 114px; +.head_healer_1 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_1.png'); + width: 90px; height: 90px; } -.headAccessory_special_blueHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png'); - width: 114px; +.head_healer_2 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_2.png'); + width: 90px; height: 90px; } -.headAccessory_special_cactusEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); +.head_healer_3 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_3.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_cactusEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); - width: 60px; - height: 60px; -} -.headAccessory_special_foxEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); +.head_healer_4 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_4.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_foxEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); - width: 60px; - height: 60px; +.head_healer_5 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_5.png'); + width: 90px; + height: 90px; } -.headAccessory_special_greenHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png'); - width: 114px; +.head_rogue_1 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_1.png'); + width: 90px; height: 90px; } -.headAccessory_special_heroicCirclet { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_heroicCirclet.png'); - width: 114px; +.head_rogue_2 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_2.png'); + width: 90px; height: 90px; } -.headAccessory_special_lionEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); +.head_rogue_3 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_3.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_lionEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); - width: 60px; - height: 60px; +.head_rogue_4 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_4.png'); + width: 90px; + height: 90px; } -.headAccessory_special_pandaEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); +.head_rogue_5 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_5.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_pandaEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); - width: 60px; - height: 60px; +.head_special_2 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_2.png'); + width: 90px; + height: 90px; } -.headAccessory_special_pigEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); +.head_special_bardHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_bardHat.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_pigEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); - width: 60px; - height: 60px; +.head_special_clandestineCowl { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_clandestineCowl.png'); + width: 90px; + height: 90px; } -.headAccessory_special_pinkHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png'); - width: 114px; +.head_special_dandyHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_dandyHat.png'); + width: 90px; height: 90px; } -.headAccessory_special_redHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png'); - width: 114px; +.head_special_fireCoralCirclet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fireCoralCirclet.png'); + width: 90px; height: 90px; } -.headAccessory_special_tigerEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); +.head_special_kabuto { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_kabuto.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_tigerEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); - width: 60px; - height: 60px; +.head_special_lunarWarriorHelm { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_lunarWarriorHelm.png'); + width: 90px; + height: 90px; } -.headAccessory_special_whiteHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png'); - width: 114px; +.head_special_mammothRiderHelm { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_mammothRiderHelm.png'); + width: 90px; height: 90px; } -.headAccessory_special_wolfEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); +.head_special_namingDay2017 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_namingDay2017.png'); width: 90px; height: 90px; } -.customize-option.headAccessory_special_wolfEars { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); - width: 60px; - height: 60px; +.head_special_pageHelm { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_pageHelm.png'); + width: 90px; + height: 90px; } -.headAccessory_special_yellowHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png'); - width: 114px; +.head_special_pyromancersTurban { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_pyromancersTurban.png'); + width: 90px; height: 90px; } -.shop_headAccessory_special_bearEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_blackHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_blueHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_cactusEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_foxEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_greenHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_heroicCirclet { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_heroicCirclet.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_lionEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_pandaEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_pigEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_pinkHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_redHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_tigerEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_whiteHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_wolfEars { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png'); - width: 68px; - height: 68px; -} -.shop_headAccessory_special_yellowHeadband { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png'); - width: 68px; - height: 68px; -} -.head_0 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png'); - width: 90px; - height: 90px; -} -.customize-option.head_0 { - background-position: -25px -15px; - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png'); - width: 60px; - height: 60px; -} -.head_healer_1 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_1.png'); - width: 90px; - height: 90px; -} -.head_healer_2 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_2.png'); - width: 90px; - height: 90px; -} -.head_healer_3 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_3.png'); - width: 90px; - height: 90px; -} -.head_healer_4 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_4.png'); - width: 90px; - height: 90px; -} -.head_healer_5 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_healer_5.png'); - width: 90px; - height: 90px; -} -.head_rogue_1 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_1.png'); - width: 90px; - height: 90px; -} -.head_rogue_2 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_2.png'); - width: 90px; - height: 90px; -} -.head_rogue_3 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_3.png'); - width: 90px; - height: 90px; -} -.head_rogue_4 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_4.png'); - width: 90px; - height: 90px; -} -.head_rogue_5 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_rogue_5.png'); - width: 90px; - height: 90px; -} -.head_special_2 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_2.png'); - width: 90px; - height: 90px; -} -.head_special_bardHat { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_bardHat.png'); - width: 90px; - height: 90px; -} -.head_special_clandestineCowl { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_clandestineCowl.png'); - width: 90px; - height: 90px; -} -.head_special_dandyHat { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_dandyHat.png'); - width: 90px; - height: 90px; -} -.head_special_fireCoralCirclet { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fireCoralCirclet.png'); - width: 90px; - height: 90px; -} -.head_special_kabuto { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_kabuto.png'); - width: 90px; - height: 90px; -} -.head_special_lunarWarriorHelm { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_lunarWarriorHelm.png'); - width: 90px; - height: 90px; -} -.head_special_mammothRiderHelm { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_mammothRiderHelm.png'); - width: 90px; - height: 90px; -} -.head_special_namingDay2017 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_namingDay2017.png'); - width: 90px; - height: 90px; -} -.head_special_pageHelm { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_pageHelm.png'); - width: 90px; - height: 90px; -} -.head_special_pyromancersTurban { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_pyromancersTurban.png'); - width: 90px; - height: 90px; -} -.head_special_roguishRainbowMessengerHood { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_roguishRainbowMessengerHood.png'); - width: 90px; - height: 90px; +.head_special_roguishRainbowMessengerHood { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_roguishRainbowMessengerHood.png'); + width: 90px; + height: 90px; } .head_special_snowSovereignCrown { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_snowSovereignCrown.png'); @@ -35063,6 +35025,214 @@ width: 68px; height: 68px; } +.headAccessory_special_bearEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_bearEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_blackHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_blueHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_cactusEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_cactusEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_foxEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_foxEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_greenHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_heroicCirclet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_heroicCirclet.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_lionEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_lionEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_pandaEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_pandaEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_pigEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_pigEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_pinkHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_redHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_tigerEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_tigerEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_whiteHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png'); + width: 114px; + height: 90px; +} +.headAccessory_special_wolfEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); + width: 90px; + height: 90px; +} +.customize-option.headAccessory_special_wolfEars { + background-position: -25px -15px; + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png'); + width: 60px; + height: 60px; +} +.headAccessory_special_yellowHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png'); + width: 114px; + height: 90px; +} +.shop_headAccessory_special_bearEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_blackHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_blueHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_cactusEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_foxEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_greenHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_heroicCirclet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_heroicCirclet.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_lionEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_pandaEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_pigEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_pinkHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_redHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_tigerEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_whiteHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_wolfEars { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_special_yellowHeadband { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png'); + width: 68px; + height: 68px; +} .shield_healer_1 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_healer_1.png'); width: 90px; diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue index 3c4c0ff5685..92d3898e3c5 100644 --- a/website/client/src/components/payments/buyGemsModal.vue +++ b/website/client/src/components/payments/buyGemsModal.vue @@ -171,7 +171,12 @@

{{ $t('limitations') }}

- {{ $t('gemSaleLimitations', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }} + {{ $t('gemSaleLimitations', { + eventStartMonth, + eventStartOrdinal, + eventEndMonth, + eventEndOrdinal, + }) }} @@ -441,6 +446,9 @@ export default { eventStartOrdinal () { return moment(this.currentEvent.start).format('Do'); }, + eventEndMonth () { + return moment(this.currentEvent.end).format('MMMM'); + }, eventEndOrdinal () { return moment(this.currentEvent.end).format('Do'); }, diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue index 7120dbabdd8..74f6f848fb4 100644 --- a/website/client/src/components/shops/buyModal.vue +++ b/website/client/src/components/shops/buyModal.vue @@ -152,7 +152,7 @@
- {{ $t('cancel') }} -
-
-
+ @@ -121,182 +108,179 @@ slot="modal-footer" class="g1g1-fine-print text-center pt-3" > - - {{ $t ('howItWorks') }} + + {{ $t('howItWorks') }}

- {{ $t ('g1g1HowItWorks') }} + {{ $t('g1g1HowItWorks') }}

- - {{ $t ('limitations') }} + + {{ $t('limitations') }}

- {{ $t ('g1g1Limitations') }} + {{ $t('g1g1Limitations') }}

@@ -308,8 +292,10 @@ import isUUID from 'validator/lib/isUUID'; import { mapState } from '@/libs/store'; import closeIcon from '@/assets/svg/close.svg'; import bigGiftIcon from '@/assets/svg/big-gift.svg'; +import ValidatedTextInput from '@/components/ui/validatedTextInput.vue'; export default { + components: { ValidatedTextInput }, data () { return { userNotFound: false, @@ -332,6 +318,12 @@ export default { if (this.userSearchTerm.length < 1) return true; return typeof this.foundUser._id === 'undefined'; }, + + userInputInvalidIssues () { + return this.userSearchTerm.length > 0 && this.userNotFound + ? [this.$t('userWithUsernameOrUserIdNotFound')] + : ['']; + }, }, watch: { userSearchTerm: { diff --git a/website/client/src/components/settings/api.vue b/website/client/src/components/settings/api.vue deleted file mode 100644 index 48a5155ddd6..00000000000 --- a/website/client/src/components/settings/api.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/dataExport.vue b/website/client/src/components/settings/dataExport.vue deleted file mode 100644 index b439483cf52..00000000000 --- a/website/client/src/components/settings/dataExport.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/website/client/src/components/settings/dayStartAdjustment.vue b/website/client/src/components/settings/dayStartAdjustment.vue deleted file mode 100644 index 54d312740cf..00000000000 --- a/website/client/src/components/settings/dayStartAdjustment.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/deleteModal.vue b/website/client/src/components/settings/deleteModal.vue deleted file mode 100644 index 3a0d167099e..00000000000 --- a/website/client/src/components/settings/deleteModal.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - diff --git a/website/client/src/components/settings/index.vue b/website/client/src/components/settings/index.vue deleted file mode 100644 index a390dbcb8fe..00000000000 --- a/website/client/src/components/settings/index.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/notifications.vue b/website/client/src/components/settings/notifications.vue deleted file mode 100644 index d53c4a614fd..00000000000 --- a/website/client/src/components/settings/notifications.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - diff --git a/website/client/src/components/settings/promoCode.vue b/website/client/src/components/settings/promoCode.vue deleted file mode 100644 index 704ec54dfff..00000000000 --- a/website/client/src/components/settings/promoCode.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - diff --git a/website/client/src/components/settings/resetModal.vue b/website/client/src/components/settings/resetModal.vue deleted file mode 100644 index 8aa9f6544e2..00000000000 --- a/website/client/src/components/settings/resetModal.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/website/client/src/components/settings/restoreModal.vue b/website/client/src/components/settings/restoreModal.vue deleted file mode 100644 index bbd86f000ab..00000000000 --- a/website/client/src/components/settings/restoreModal.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - diff --git a/website/client/src/components/settings/site.vue b/website/client/src/components/settings/site.vue deleted file mode 100644 index 82db3f08f56..00000000000 --- a/website/client/src/components/settings/site.vue +++ /dev/null @@ -1,859 +0,0 @@ - - - - - diff --git a/website/client/src/components/settings/usernameForm.vue b/website/client/src/components/settings/usernameForm.vue index 1d680302c27..c62c6054588 100644 --- a/website/client/src/components/settings/usernameForm.vue +++ b/website/client/src/components/settings/usernameForm.vue @@ -115,8 +115,6 @@ } .input-error { - color: $red-50; - font-size: 90%; width: 100%; } diff --git a/website/client/src/components/shops/featuredItemsHeader.vue b/website/client/src/components/shops/featuredItemsHeader.vue index 4d23ca3dad1..416814bec0f 100644 --- a/website/client/src/components/shops/featuredItemsHeader.vue +++ b/website/client/src/components/shops/featuredItemsHeader.vue @@ -35,7 +35,7 @@ :key="item.key" :item="item" :price="item.value" - :item-content-class="'shop_'+item.key" + :item-content-class="`shop_${item.key}`" :empty-item="false" :popover-position="'top'" @click="featuredItemSelected(item)" diff --git a/website/client/src/components/shops/gemPrice.vue b/website/client/src/components/shops/gemPrice.vue new file mode 100644 index 00000000000..988aec5ac9a --- /dev/null +++ b/website/client/src/components/shops/gemPrice.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/website/client/src/components/shops/quests/index.vue b/website/client/src/components/shops/quests/index.vue index c6607a643c1..06bd3334db8 100644 --- a/website/client/src/components/shops/quests/index.vue +++ b/website/client/src/components/shops/quests/index.vue @@ -92,7 +92,7 @@ :item="item" :price="item.goldValue ? item.goldValue : item.value" :price-type="item.goldValue ? 'gold' : 'gem'" - :item-content-class="'inventory_quest_scroll_'+item.key" + :item-content-class="`inventory_quest_scroll_${item.key}`" :empty-item="false" :popover-position="'top'" @click="selectItem(item)" diff --git a/website/client/src/components/shops/quests/questRewards.vue b/website/client/src/components/shops/quests/questRewards.vue index 21568f3bfab..9d7b1851207 100644 --- a/website/client/src/components/shops/quests/questRewards.vue +++ b/website/client/src/components/shops/quests/questRewards.vue @@ -82,7 +82,7 @@ diff --git a/website/client/src/components/static/home.vue b/website/client/src/components/static/home.vue index 07b97b1cd00..01275a28c20 100644 --- a/website/client/src/components/static/home.vue +++ b/website/client/src/components/static/home.vue @@ -880,8 +880,6 @@ export default { }, mounted () { hello.init({ - facebook: process.env.FACEBOOK_KEY, // eslint-disable-line - // windows: WINDOWS_CLIENT_ID, google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line }); this.$store.dispatch('common:setTitle', { diff --git a/website/client/src/components/tasks/column.vue b/website/client/src/components/tasks/column.vue index d64420e123a..a4aa1314d89 100644 --- a/website/client/src/components/tasks/column.vue +++ b/website/client/src/components/tasks/column.vue @@ -682,7 +682,9 @@ export default { // as default filter for daily // and set the filter as 'due' only when the component first // loads and not on subsequent reloads. - if (type === 'daily' && filter === '' && !this.challenge) { + if ( + type === 'daily' && filter === '' && !this.challenge + ) { filter = 'due'; // eslint-disable-line no-param-reassign } diff --git a/website/client/src/components/tasks/modal-controls/lockableLabel.vue b/website/client/src/components/tasks/modal-controls/lockableLabel.vue index 7c3e5f012c6..aa09a81da12 100644 --- a/website/client/src/components/tasks/modal-controls/lockableLabel.vue +++ b/website/client/src/components/tasks/modal-controls/lockableLabel.vue @@ -13,7 +13,6 @@ @@ -23,11 +22,11 @@ @import '~@/assets/scss/colors.scss'; label { - height: 1.5rem; font-size: 14px; font-weight: bold; line-height: 1.71; letter-spacing: normal; + margin: 0; } .gray-200 { diff --git a/website/client/src/components/tasks/modal-controls/selectDifficulty.vue b/website/client/src/components/tasks/modal-controls/selectDifficulty.vue index 1dfc16c3c4b..019ccdc5447 100644 --- a/website/client/src/components/tasks/modal-controls/selectDifficulty.vue +++ b/website/client/src/components/tasks/modal-controls/selectDifficulty.vue @@ -2,7 +2,6 @@
-