{:else if progress.progressQuest === undefined}
-
{:else}
{progress.progressQuest.objectives?.[0]?.have ?? 0}
/
diff --git a/apps/frontend/components/tooltips/auction-already-have/TooltipAuctionAlreadyHave.svelte b/apps/frontend/components/tooltips/auction-already-have/TooltipAuctionAlreadyHave.svelte
index b3b1d4772..a70e72057 100644
--- a/apps/frontend/components/tooltips/auction-already-have/TooltipAuctionAlreadyHave.svelte
+++ b/apps/frontend/components/tooltips/auction-already-have/TooltipAuctionAlreadyHave.svelte
@@ -6,7 +6,7 @@
import { ItemLocation } from '@/enums/item-location';
import type { HasNameAndRealm, UserItem } from '@/types/shared';
- import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
+ import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
type Props = {
groupItems?: boolean;
@@ -92,7 +92,10 @@
{#each items as item}
diff --git a/apps/frontend/components/tooltips/dailies/TooltipDailies.svelte b/apps/frontend/components/tooltips/dailies/TooltipDailies.svelte
index f033bc3e9..542c9d35d 100644
--- a/apps/frontend/components/tooltips/dailies/TooltipDailies.svelte
+++ b/apps/frontend/components/tooltips/dailies/TooltipDailies.svelte
@@ -8,7 +8,7 @@
import type { Character, DailyQuestsReward } from '@/types';
import type { GlobalDailyQuest } from '@/types/data';
- import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
+ import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';
export let callings: [DailyQuestsReward, GlobalDailyQuest, boolean][];
@@ -63,8 +63,8 @@
{#each callings as [rewards, daily, status], callingIndex}
|
-
+
|
{reward.name}
diff --git a/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte b/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
index ef424ab0f..388eae2f8 100644
--- a/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
+++ b/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
@@ -1,20 +1,14 @@
-{#snippet hoverIcon(icon: ComponentProps['icon'])}
+{#snippet hoverIcon(icon: Icon)}
-
+
{/snippet}
@@ -195,7 +194,7 @@
{:else if (thing.bonusIds || []).includes(999999)}
-
+
{/if}
diff --git a/apps/frontend/components/vendors/VendorsOptions.svelte b/apps/frontend/components/vendors/VendorsOptions.svelte
index 497a0ef86..3aa440f30 100644
--- a/apps/frontend/components/vendors/VendorsOptions.svelte
+++ b/apps/frontend/components/vendors/VendorsOptions.svelte
@@ -3,7 +3,7 @@
import { browserState } from '@/shared/state/browser.svelte';
import CheckboxInput from '@/shared/components/forms/CheckboxInput.svelte';
- import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
+ import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
let filters = $derived.by(() => {
let byType1: string[] = [];
@@ -160,7 +160,7 @@
>
Filters: {filters}
-
{#each farms as farm}
{/each}
@@ -120,7 +120,7 @@
{@const dropData = dropDatas[dataIndex]}
{@const icon = getDropIcon(drop, false)}
-
+
{dropData.name}
diff --git a/apps/frontend/components/zone-maps/ZoneMapsMap.svelte b/apps/frontend/components/zone-maps/ZoneMapsMap.svelte
index f3f2cc9f3..a47b96375 100644
--- a/apps/frontend/components/zone-maps/ZoneMapsMap.svelte
+++ b/apps/frontend/components/zone-maps/ZoneMapsMap.svelte
@@ -19,7 +19,7 @@
import Checkbox from '@/shared/components/forms/CheckboxInput.svelte';
import ClassIcon from '@/shared/components/images/ClassIcon.svelte';
import Counter from './ZoneMapsCounter.svelte';
- import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
+ import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import Image from '@/shared/components/images/Image.svelte';
import Loot from './ZoneMapsLoot.svelte';
import Thing from './ZoneMapsThing.svelte';
@@ -416,7 +416,7 @@
| MAX
{/if}
-
Loot list
-
-
+
{:else}
@@ -188,7 +188,7 @@
type={FarmIdType[farm.idType].toLowerCase()}
>
-
+
{#if status.need && farm.type != FarmType.Vendor && map.mapName !== 'misc_exiles_reach'}
diff --git a/apps/frontend/data/expansion.ts b/apps/frontend/data/expansion.ts
index c988e3dc7..9b155d214 100644
--- a/apps/frontend/data/expansion.ts
+++ b/apps/frontend/data/expansion.ts
@@ -1,36 +1,36 @@
import sortBy from 'lodash/sortBy';
-import { Expansion } from '@/types';
+import { ExpansionData } from '@/types';
-export const expansionMap: Record = Object.fromEntries(
+export const expansionMap: Record = Object.fromEntries(
[
- new Expansion(0, 'Classic', 'classic', 'Classic'),
- new Expansion(1, 'Burning Crusade', 'burning-crusade', 'TBC'),
- new Expansion(2, 'Wrath of the Lich King', 'wrath-of-the-lich-king', 'WotLK'),
- new Expansion(3, 'Cataclysm', 'cataclysm', 'Cata'),
- new Expansion(4, 'Mists of Pandaria', 'mists-of-pandaria', 'MoP'),
- new Expansion(5, 'Warlords of Draenor', 'warlords-of-draenor', 'WoD'),
- new Expansion(6, 'Legion', 'legion', 'Legion'),
- new Expansion(7, 'Battle for Azeroth', 'battle-for-azeroth', 'BfA'),
- new Expansion(8, 'Shadowlands', 'shadowlands', 'SL'),
- new Expansion(9, 'Dragonflight', 'dragonflight', 'DF'),
- new Expansion(10, 'The War Within', 'war-within', 'TWW'),
- new Expansion(11, 'Midnight', 'midnight', 'Mid'),
+ new ExpansionData(0, 'Classic', 'classic', 'Classic'),
+ new ExpansionData(1, 'Burning Crusade', 'burning-crusade', 'TBC'),
+ new ExpansionData(2, 'Wrath of the Lich King', 'wrath-of-the-lich-king', 'WotLK'),
+ new ExpansionData(3, 'Cataclysm', 'cataclysm', 'Cata'),
+ new ExpansionData(4, 'Mists of Pandaria', 'mists-of-pandaria', 'MoP'),
+ new ExpansionData(5, 'Warlords of Draenor', 'warlords-of-draenor', 'WoD'),
+ new ExpansionData(6, 'Legion', 'legion', 'Legion'),
+ new ExpansionData(7, 'Battle for Azeroth', 'battle-for-azeroth', 'BfA'),
+ new ExpansionData(8, 'Shadowlands', 'shadowlands', 'SL'),
+ new ExpansionData(9, 'Dragonflight', 'dragonflight', 'DF'),
+ new ExpansionData(10, 'The War Within', 'war-within', 'TWW'),
+ new ExpansionData(11, 'Midnight', 'midnight', 'Mid'),
].map((exp) => [exp.id, exp])
);
-export const expansionSlugMap: Record = Object.fromEntries(
+export const expansionSlugMap: Record = Object.fromEntries(
Object.values(expansionMap).map((expansion) => [expansion.slug, expansion])
);
-export const expansionShortNameMap: Record = Object.fromEntries(
+export const expansionShortNameMap: Record = Object.fromEntries(
Object.values(expansionMap).map((expansion) => [
expansion.shortName.toLocaleLowerCase(),
expansion,
])
);
-export const expansionOrder: Expansion[] = sortBy(
+export const expansionOrder: ExpansionData[] = sortBy(
Object.values(expansionMap),
(expansion) => expansion.id
);
diff --git a/apps/frontend/data/holidays.ts b/apps/frontend/data/holidays.ts
index 11b0566bf..af2f5c245 100644
--- a/apps/frontend/data/holidays.ts
+++ b/apps/frontend/data/holidays.ts
@@ -1,5 +1,4 @@
import { Holiday } from '@/enums/holiday';
-import { getNumberKeyedEntries } from '@/utils/get-number-keyed-entries';
export const holidayMinimumLevel: Record = {
// Timewalking: TBC
diff --git a/apps/frontend/data/icons.ts b/apps/frontend/data/icons.ts
index 7de3b375a..c20077b4a 100644
--- a/apps/frontend/data/icons.ts
+++ b/apps/frontend/data/icons.ts
@@ -1,7 +1,6 @@
-import type { IconifyIcon } from '@iconify/types';
-
import { Constants } from '@/data/constants';
import { iconLibrary } from '@/shared/icons';
+import type { Icon } from '@/types/icons';
export const imageStrings: Record = {
alliance: Constants.icons.alliance,
@@ -39,7 +38,7 @@ export const imageStrings: Record = {
'gold-medal': 'achievement/8890',
};
-export const iconStrings: Record = {
+export const iconStrings: Record = {
exclamation: iconLibrary.mdiExclamationThick,
fire: iconLibrary.mdiFire,
item: iconLibrary.mdiGiftOutline,
@@ -80,7 +79,7 @@ export const iconStrings: Record = {
armorPlate: iconLibrary.mdiLetterP,
};
-export const soulbindSockets: Record = {
+export const soulbindSockets: Record = {
1: iconLibrary.mdiLightningBoltOutline, // Finesse
2: iconLibrary.mdiSwordCross, // Potency
3: iconLibrary.mdiShieldHalfFull, // Endurance
diff --git a/apps/frontend/data/professions/cooldowns.ts b/apps/frontend/data/professions/cooldowns.ts
index 527daec0b..29d5d8ac9 100644
--- a/apps/frontend/data/professions/cooldowns.ts
+++ b/apps/frontend/data/professions/cooldowns.ts
@@ -1,6 +1,8 @@
import { Profession } from '@/enums/profession';
import { DbResetType } from '@/shared/stores/db/enums';
import type { ProfessionCooldownQuest, ProfessionCooldownSpell } from '@/types';
+import { expansionSubProfession } from '../sub-professions';
+import { Expansion } from '@/enums/expansion';
export const expansionProfessionConcentration: Record> = {
// Midnight
@@ -399,6 +401,7 @@ export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownS
key: 'midProfessionSkinningGloomclaw',
name: '[Mid] Skin Gloomclaw (Eversong)',
profession: Profession.Skinning,
+ subProfessionId: expansionSubProfession[Expansion.Midnight][Profession.Skinning],
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88545],
@@ -408,6 +411,7 @@ export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownS
key: 'midProfessionSkinningSilverscale',
name: "[Mid] Skin Silverscale (Zul'Aman)",
profession: Profession.Skinning,
+ subProfessionId: expansionSubProfession[Expansion.Midnight][Profession.Skinning],
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88526],
@@ -417,6 +421,7 @@ export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownS
key: 'midProfessionSkinningLumenfin',
name: '[Mid] Skin Lumenfin (Harandar)',
profession: Profession.Skinning,
+ subProfessionId: expansionSubProfession[Expansion.Midnight][Profession.Skinning],
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88531],
@@ -426,6 +431,7 @@ export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownS
key: 'midProfessionSkinningUmbrafang',
name: '[Mid] Skin Umbrafang (Voidstorm)',
profession: Profession.Skinning,
+ subProfessionId: expansionSubProfession[Expansion.Midnight][Profession.Skinning],
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88532],
@@ -435,6 +441,7 @@ export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownS
key: 'midProfessionSkinningNetherscythe',
name: '[Mid] Skin Netherscythe (Voidstorm)',
profession: Profession.Skinning,
+ subProfessionId: expansionSubProfession[Expansion.Midnight][Profession.Skinning],
minimumLevel: 80,
reset: DbResetType.Daily,
ids: [88524],
diff --git a/apps/frontend/data/professions/skinning.ts b/apps/frontend/data/professions/skinning.ts
index 60d83783b..729688a20 100644
--- a/apps/frontend/data/professions/skinning.ts
+++ b/apps/frontend/data/professions/skinning.ts
@@ -1,5 +1,7 @@
+import { Expansion } from '@/enums/expansion';
import { Profession } from '@/enums/profession';
import type { TaskProfession } from '@/types/data';
+import { expansionSubProfession } from '../sub-professions';
const midnightTaskQuests = [
93710, // Tempered in Darkness
@@ -11,7 +13,7 @@ const midnightTaskQuests = [
export const midnightSkinning: TaskProfession = {
id: Profession.Skinning,
- subProfessionId: 2917,
+ subProfessionId: expansionSubProfession[Expansion.Midnight][Profession.Skinning],
treatiseQuest: {
itemId: 245828, // Thalassian Treatise on Skinning
questId: 95136,
diff --git a/apps/frontend/data/quests.ts b/apps/frontend/data/quests.ts
index d3bba3bb4..776d331af 100644
--- a/apps/frontend/data/quests.ts
+++ b/apps/frontend/data/quests.ts
@@ -1,6 +1,14 @@
import { ItemQuality } from '@/enums/item-quality';
+import { QuestStatus } from '@/enums/quest-status';
import { GlobalDailyQuest } from '@/types/data';
+export const questStatusClass: Record = {
+ [QuestStatus.NotStarted]: 'status-fail',
+ [QuestStatus.InProgress]: 'status-shrug',
+ [QuestStatus.Completed]: 'status-success',
+ [QuestStatus.Error]: 'status-fail',
+};
+
export const progressQuestMap: Record = {
slKorthia: 'shapingFate',
slNewDeal: 'newDeal',
diff --git a/apps/frontend/data/region.ts b/apps/frontend/data/region.ts
index 7466b6dd3..8c7c1f8ba 100644
--- a/apps/frontend/data/region.ts
+++ b/apps/frontend/data/region.ts
@@ -1,7 +1,7 @@
import { Region } from '@/enums/region';
import { iconLibrary } from '@/shared/icons';
import type { ResetTime } from '@/types';
-import type { IconifyIcon } from '@iconify/types';
+import type { Icon } from '@/types/icons';
// Times are [hour, minute] in UTC
export const resetTimes: Record = {
@@ -37,7 +37,7 @@ export const resetTimes: Record = {
},
};
-export const euLocales: Record = {
+export const euLocales: Record = {
deDE: {
icon: iconLibrary.twemojiFlagGermany,
name: 'Germany',
diff --git a/apps/frontend/data/sub-professions.ts b/apps/frontend/data/sub-professions.ts
new file mode 100644
index 000000000..2ac871c0b
--- /dev/null
+++ b/apps/frontend/data/sub-professions.ts
@@ -0,0 +1,21 @@
+import { Expansion } from '@/enums/expansion';
+import { Profession } from '@/enums/profession';
+
+export const expansionSubProfession: Record> = {
+ [Expansion.Midnight]: {
+ [Profession.Alchemy]: 2906,
+ [Profession.Archaeology]: null,
+ [Profession.Blacksmithing]: 2907,
+ [Profession.Cooking]: 2908,
+ [Profession.Enchanting]: 2909,
+ [Profession.Engineering]: 2910,
+ [Profession.Fishing]: 2911,
+ [Profession.Herbalism]: 2912,
+ [Profession.Inscription]: 2913,
+ [Profession.Jewelcrafting]: 2914,
+ [Profession.Leatherworking]: 2915,
+ [Profession.Mining]: 2916,
+ [Profession.Skinning]: 2917,
+ [Profession.Tailoring]: 2918,
+ },
+};
diff --git a/apps/frontend/data/tasks/10-the-war-within/11-2-0.ts b/apps/frontend/data/tasks/10-the-war-within/11-2-0.ts
index efc134f64..2f3203490 100644
--- a/apps/frontend/data/tasks/10-the-war-within/11-2-0.ts
+++ b/apps/frontend/data/tasks/10-the-war-within/11-2-0.ts
@@ -1,4 +1,3 @@
-import { Constants } from '@/data/constants';
import { iconLibrary } from '@/shared/icons';
import { DbResetType } from '@/shared/stores/db/enums';
import { userState } from '@/user-home/state/user';
diff --git a/apps/frontend/data/tasks/10-the-war-within/delves.ts b/apps/frontend/data/tasks/10-the-war-within/delves.ts
index c4ffe30b0..b00c9fff8 100644
--- a/apps/frontend/data/tasks/10-the-war-within/delves.ts
+++ b/apps/frontend/data/tasks/10-the-war-within/delves.ts
@@ -1,4 +1,4 @@
-import { iconComponents } from '@/shared/icons';
+import { iconLibrary } from '@/shared/icons';
import { DbResetType } from '@/shared/stores/db/enums';
import type { Task } from '@/types/tasks';
@@ -25,7 +25,7 @@ export const twwDelves: Task = {
{
key: 'gilded',
name: 'Gilded Stash',
- icon: iconComponents.GameCutDiamond,
+ icon: iconLibrary.GameCutDiamond,
minimumLevel: 80,
questReset: DbResetType.Weekly,
questResetForced: true,
@@ -42,7 +42,7 @@ export const twwDelves: Task = {
{
key: 'map',
name: 'Map Drop',
- icon: iconComponents.GameTreasureMap,
+ icon: iconLibrary.GameTreasureMap,
minimumLevel: 80,
alwaysStarted: true,
questReset: DbResetType.Weekly,
diff --git a/apps/frontend/data/tasks/11-midnight/12-0-0.ts b/apps/frontend/data/tasks/11-midnight/12-0-0.ts
index ab03dc5f1..ef1feba52 100644
--- a/apps/frontend/data/tasks/11-midnight/12-0-0.ts
+++ b/apps/frontend/data/tasks/11-midnight/12-0-0.ts
@@ -87,6 +87,7 @@ export const midChores12_0_0: Task = {
key: 'unity',
name: 'Unity',
minimumLevel: 90,
+ showQuestName: true,
icon: aliasedIcons.planet,
questReset: DbResetType.Weekly, // TODO: weird 3 week garbage?
questIds: [
diff --git a/apps/frontend/data/tasks/11-midnight/prey.ts b/apps/frontend/data/tasks/11-midnight/prey.ts
index 38c63e223..11aeb4e35 100644
--- a/apps/frontend/data/tasks/11-midnight/prey.ts
+++ b/apps/frontend/data/tasks/11-midnight/prey.ts
@@ -104,7 +104,7 @@ const nightmareQuestIds: number[] = [
];
const preyFunc = (questIds: number[], index: number) => {
- return (char: Character, chore: Chore) => {
+ return (char: Character) => {
const charQuests = userState.quests.characterById.get(char.id);
const completedOrInProgress = questIds.filter(
(questId) =>
diff --git a/apps/frontend/data/tasks/events/bonus.ts b/apps/frontend/data/tasks/events/bonus.ts
index 82920b13b..3ad2b621a 100644
--- a/apps/frontend/data/tasks/events/bonus.ts
+++ b/apps/frontend/data/tasks/events/bonus.ts
@@ -52,7 +52,7 @@ export const eventBonus: Task = {
requiredHolidays: [Holiday.BonusBattleground],
questReset: DbResetType.Weekly,
questResetForced: true,
- questIds: [83345], // A Call to Battle
+ questIds: [93593], // A Call to Battle
},
{
key: 'petBattles',
diff --git a/apps/frontend/enums/expansion.ts b/apps/frontend/enums/expansion.ts
new file mode 100644
index 000000000..ec11783c5
--- /dev/null
+++ b/apps/frontend/enums/expansion.ts
@@ -0,0 +1,14 @@
+export enum Expansion {
+ Classic = 0,
+ TheBurningCrusade = 1,
+ WrathOfTheLichKing = 2,
+ Cataclysm = 3,
+ MistsOfPandaria = 4,
+ WarlordsOfDraenor = 5,
+ Legion = 6,
+ BattleForAzeroth = 7,
+ Shadowlands = 8,
+ Dragonflight = 9,
+ TheWarWithin = 10,
+ Midnight = 11,
+}
diff --git a/apps/frontend/shared/components/collected-icon/CollectedIcon.svelte b/apps/frontend/shared/components/collected-icon/CollectedIcon.svelte
index e3cd9c784..c031683b8 100644
--- a/apps/frontend/shared/components/collected-icon/CollectedIcon.svelte
+++ b/apps/frontend/shared/components/collected-icon/CollectedIcon.svelte
@@ -1,5 +1,5 @@
+
+
diff --git a/apps/frontend/shared/components/icons/YesNoIcon.svelte b/apps/frontend/shared/components/icons/YesNoIcon.svelte
index f2a6bd9bf..19ebcd984 100644
--- a/apps/frontend/shared/components/icons/YesNoIcon.svelte
+++ b/apps/frontend/shared/components/icons/YesNoIcon.svelte
@@ -1,22 +1,20 @@
-
+
diff --git a/apps/frontend/shared/components/images/IconifyIcon.svelte b/apps/frontend/shared/components/images/IconifyIcon.svelte
deleted file mode 100644
index d864307f4..000000000
--- a/apps/frontend/shared/components/images/IconifyIcon.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
diff --git a/apps/frontend/shared/components/images/IconifyWrapper.svelte b/apps/frontend/shared/components/images/IconifyWrapper.svelte
index 2cb50e743..a11628a26 100644
--- a/apps/frontend/shared/components/images/IconifyWrapper.svelte
+++ b/apps/frontend/shared/components/images/IconifyWrapper.svelte
@@ -1,13 +1,18 @@
-
-
-
+{#if 'body' in icon}
+ {@const actualIcon = (icon || iconLibrary.mdiImageBrokenVariant) as IconifyIcon}
+
+{:else}
+ {@const Icon = icon as ComponentIcon}
+
+
+
+{/if}
diff --git a/apps/frontend/shared/components/paginate/PaginateBar.svelte b/apps/frontend/shared/components/paginate/PaginateBar.svelte
index e36e69f27..dc4750f71 100644
--- a/apps/frontend/shared/components/paginate/PaginateBar.svelte
+++ b/apps/frontend/shared/components/paginate/PaginateBar.svelte
@@ -1,7 +1,7 @@
|