From ce35261427744c2266348274063fe3372a3d0a9d Mon Sep 17 00:00:00 2001 From: Freddie Date: Tue, 24 Mar 2026 21:12:34 -0700 Subject: [PATCH 1/7] Basic setup for ProfessionsV2 column --- apps/frontend/components/home/HomeTable.svelte | 3 +++ .../frontend/components/home/table/HomeTableGroupHead.svelte | 2 ++ .../home/table/row/HomeTableRowProfessionsV2.svelte | 5 +++++ apps/frontend/shared/stores/settings/types/view.ts | 1 + apps/frontend/user-home/components/settings/data.ts | 1 + .../components/settings/sections/views/Views.svelte | 1 + packages/csharp-lib/Models/ApplicationUserSettings.cs | 2 ++ 7 files changed, 15 insertions(+) create mode 100644 apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte diff --git a/apps/frontend/components/home/HomeTable.svelte b/apps/frontend/components/home/HomeTable.svelte index 0d32e29bf..a42e185fe 100644 --- a/apps/frontend/components/home/HomeTable.svelte +++ b/apps/frontend/components/home/HomeTable.svelte @@ -29,6 +29,7 @@ import RowProfessionConcentration from './table/row/HomeTableRowProfessionConcentration.svelte'; import RowProfessionCooldowns from './table/row/HomeTableRowProfessionCooldowns.svelte'; import RowProfessionMoxie from './table/row/HomeTableRowProfessionMoxie.svelte'; + import RowProfessionsV2 from './table/row/HomeTableRowProfessionsV2.svelte'; import RowProfessionWorkOrders from './table/row/HomeTableRowProfessionWorkOrders.svelte'; import RowProgress from './table/row/HomeTableRowProgress.svelte'; import RowRestedExperience from './table/row/HomeTableRowRestedExperience.svelte'; @@ -131,6 +132,8 @@ {:else if field === 'professionsSecondary'} + {:else if field === 'professionsV2'} + {:else if field === 'progress'} {:else if field === 'restedExperience'} diff --git a/apps/frontend/components/home/table/HomeTableGroupHead.svelte b/apps/frontend/components/home/table/HomeTableGroupHead.svelte index 50cd4036b..47736f50c 100644 --- a/apps/frontend/components/home/table/HomeTableGroupHead.svelte +++ b/apps/frontend/components/home/table/HomeTableGroupHead.svelte @@ -228,6 +228,8 @@ > {:else if field === 'professions'} Professions + {:else if field === 'professionsV2'} + Professions {:else if field === 'professionsSecondary'} Secondary Profs {:else if field === 'progress'} diff --git a/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte b/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte new file mode 100644 index 000000000..8dca6cfde --- /dev/null +++ b/apps/frontend/components/home/table/row/HomeTableRowProfessionsV2.svelte @@ -0,0 +1,5 @@ + diff --git a/apps/frontend/shared/stores/settings/types/view.ts b/apps/frontend/shared/stores/settings/types/view.ts index c3426cb44..e21712efc 100644 --- a/apps/frontend/shared/stores/settings/types/view.ts +++ b/apps/frontend/shared/stores/settings/types/view.ts @@ -15,6 +15,7 @@ export interface SettingsView { homeCurrencies: number[]; homeItems: number[]; homeLockouts: number[]; + homeProfessionsV2: string[]; homeProgress: string[]; homeTasks: string[]; diff --git a/apps/frontend/user-home/components/settings/data.ts b/apps/frontend/user-home/components/settings/data.ts index 536ea7ad0..68a2ffdaf 100644 --- a/apps/frontend/user-home/components/settings/data.ts +++ b/apps/frontend/user-home/components/settings/data.ts @@ -32,6 +32,7 @@ export const homeChoices: SettingsChoice[] = [ { id: 'mythicPlusScore', name: 'Mythic+ score' }, { id: 'playedTime', name: 'Played time' }, { id: 'professions', name: 'Professions - Primary' }, + { id: 'professionsV2', name: 'Professions - Primary (V2)' }, { id: 'professionsSecondary', name: 'Professions - Secondary' }, { id: 'professionConcentration', name: 'Profession Concentration [Mid]' }, { id: 'professionConcentrationTWW', name: 'Profession Concentration [TWW]' }, diff --git a/apps/frontend/user-home/components/settings/sections/views/Views.svelte b/apps/frontend/user-home/components/settings/sections/views/Views.svelte index 3270a10e5..91c82b737 100644 --- a/apps/frontend/user-home/components/settings/sections/views/Views.svelte +++ b/apps/frontend/user-home/components/settings/sections/views/Views.svelte @@ -22,6 +22,7 @@ homeCurrencies: [], homeItems: [], homeLockouts: [], + homeProfessionsV2: [], homeProgress: [], homeTasks: [], disabledChores: {}, diff --git a/packages/csharp-lib/Models/ApplicationUserSettings.cs b/packages/csharp-lib/Models/ApplicationUserSettings.cs index ad03b1981..53ffd2bbe 100644 --- a/packages/csharp-lib/Models/ApplicationUserSettings.cs +++ b/packages/csharp-lib/Models/ApplicationUserSettings.cs @@ -112,6 +112,7 @@ public class ApplicationUserSettings "professionWorkOrders", "professions", "professionsSecondary", + "professionsV2", "progress", "restedExperience", "statsSpeed", @@ -444,6 +445,7 @@ public class ApplicationUserSettingsView public List HomeCurrencies { get; set; } = new(); public List HomeItems { get; set; } = new(); public List HomeLockouts { get; set; } = new(); + public List HomeProfessionsV2 { get; set; } = new(); public List HomeProgress { get; set; } = new(); public List HomeTasks { get; set; } = new(); From 41ce4bbcee1b56c385a17a3542beddd49726cb58 Mon Sep 17 00:00:00 2001 From: Freddie Date: Thu, 26 Mar 2026 18:46:57 -0700 Subject: [PATCH 2/7] Add decor filter to vendors --- .../frontend/components/vendors/VendorsOptions.svelte | 11 ++++++++++- apps/frontend/shared/state/browser.svelte.ts | 2 ++ apps/frontend/user-home/state/lazy/vendors.svelte.ts | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/frontend/components/vendors/VendorsOptions.svelte b/apps/frontend/components/vendors/VendorsOptions.svelte index 3aa440f30..07a71adda 100644 --- a/apps/frontend/components/vendors/VendorsOptions.svelte +++ b/apps/frontend/components/vendors/VendorsOptions.svelte @@ -46,9 +46,12 @@ byType2 = ['ALL']; } - if (browserState.current.vendors.showDragonriding) { + if (browserState.current.vendors.showDecor) { byThing.push('D'); } + if (browserState.current.vendors.showDragonriding) { + byThing.push('F'); + } if (browserState.current.vendors.showIllusions) { byThing.push('I'); } @@ -217,6 +220,12 @@
Things: + +