Deploy

apps/frontend/auctions/Sidebar.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { location, replace } from 'svelte-spa-router';
+    import { replace, router } from 'svelte-spa-router';
 
     import { auctionsAppState } from '@/auctions/stores/state';
     import { Region } from '@/enums/region';
@@ -27,7 +27,7 @@
         if (oldRegion !== newRegion) {
             $auctionsAppState.region = newRegion;
             replace(
-                $location.replace(
+                router.location.replace(
                     `/${Region[oldRegion].toLowerCase()}/`,
                     `/${Region[newRegion].toLowerCase()}/`
                 )
@@ -76,7 +76,7 @@
     >
         <div slot="before" class="before">
             <div class="regions">
                 {#each ['us', 'eu', 'kr', 'tw'] as region}
                     <button
                         class="border"
                         class:active={Region[$auctionsAppState.region].toLowerCase() === region}

apps/frontend/auctions/components/browse/Browse.svelte

@@ -1,72 +1,77 @@
 <script lang="ts">
-    import { onMount } from 'svelte'
-    import { location, replace } from 'svelte-spa-router'
+    import { onMount } from 'svelte';
+    import { replace, router } from 'svelte-spa-router';
 
-    import { browseStore } from './store'
-    import { auctionsAppState } from '@/auctions/stores/state'
-    import { Region } from '@/enums/region'
-    import { auctionStore } from '@/stores/auction'
-    import type { MultiSlugParams } from '@/types'
-    import type { AuctionCategory } from '@/types/data/auction'
+    import { browseStore } from './store';
+    import { auctionsAppState } from '@/auctions/stores/state';
+    import { Region } from '@/enums/region';
+    import { auctionStore } from '@/stores/auction';
+    import type { MultiSlugParams } from '@/types';
+    import type { AuctionCategory } from '@/types/data/auction';
 
-    import Results from '@/auctions/components/results/Results.svelte'
-    import UnderConstruction from '@/shared/components/under-construction/UnderConstruction.svelte'
+    import Results from '@/auctions/components/results/Results.svelte';
+    import UnderConstruction from '@/shared/components/under-construction/UnderConstruction.svelte';
 
-    export let params: MultiSlugParams
+    export let params: MultiSlugParams;
 
-    let categories: AuctionCategory[]
-    let category: AuctionCategory
-    let selected: string
+    let categories: AuctionCategory[];
+    let category: AuctionCategory;
+    let selected: string;
     $: {
-        const usefulParams = [params.slug2, params.slug3, params.slug4, params.slug5]
-            .filter((slug) => !!slug)
+        const usefulParams = [params.slug2, params.slug3, params.slug4, params.slug5].filter(
+            (slug) => !!slug
+        );
 
-        const newCategories: AuctionCategory[] = []
-        let newCategory: AuctionCategory = undefined
-        let newSelected: string = undefined
+        const newCategories: AuctionCategory[] = [];
+        let newCategory: AuctionCategory = undefined;
+        let newSelected: string = undefined;
         for (const param of usefulParams) {
             if (param.indexOf(':') > 0) {
-                newSelected = param
-                continue
+                newSelected = param;
+                continue;
             }
 
             if (!newCategory) {
-                newCategory = $auctionStore.categories.filter((cat) => cat.slug === param)[0]
-            }
-            else {
-                newCategory = (newCategory.children || []).filter((cat) => cat.slug === param)[0]
+                newCategory = $auctionStore.categories.filter((cat) => cat.slug === param)[0];
+            } else {
+                newCategory = (newCategory.children || []).filter((cat) => cat.slug === param)[0];
             }
 
             if (!newCategory) {
-                break
+                break;
             }
-            newCategories.push(newCategory)
+            newCategories.push(newCategory);
         }
 
-        if (!categories || categories.map((c) => c.slug).join('|') !== newCategories.map((c) => c.slug).join('|')) {
-            categories = newCategories
+        if (
+            !categories ||
+            categories.map((c) => c.slug).join('|') !== newCategories.map((c) => c.slug).join('|')
+        ) {
+            categories = newCategories;
         }
         if (newCategory?.id !== category?.id) {
-            category = newCategory
+            category = newCategory;
         }
         if (newSelected !== selected) {
-            selected = newSelected
+            selected = newSelected;
         }
     }
 
     onMount(() => {
         if (params.slug1) {
-            const oldRegion = $auctionsAppState.region
-            const newRegion = Region[params.slug1.toUpperCase() as keyof typeof Region]
+            const oldRegion = $auctionsAppState.region;
+            const newRegion = Region[params.slug1.toUpperCase() as keyof typeof Region];
             if (oldRegion !== newRegion) {
-                $auctionsAppState.region = newRegion
-                replace($location.replace(
-                    `/${Region[oldRegion].toLowerCase()}/`,
-                    `/${Region[newRegion].toLowerCase()}/`
-                ))
+                $auctionsAppState.region = newRegion;
+                replace(
+                    router.location.replace(
+                        `/${Region[oldRegion].toLowerCase()}/`,
+                        `/${Region[newRegion].toLowerCase()}/`
+                    )
+                );
             }
         }
-    })
+    });
 </script>
 
 <style lang="scss">
@@ -82,23 +87,29 @@
 
 <div class="wrapper-column">
     <UnderConstruction />
-    
+
     {#if category?.browseable}
         <div class="header">
             <span>
                 <code>[{Region[$auctionsAppState.region]}]</code>
                 Search
             </span>
             {#each categories as category, categoryIndex}
                 <span>&gt;</span>
-                <a href="#/browse/{params.slug1}/{categories.slice(0, categoryIndex + 1).map((c) => c.slug).join('/')}">
+                <a
+                    href="#/browse/{params.slug1}/{categories
+                        .slice(0, categoryIndex + 1)
+                        .map((c) => c.slug)
+                        .join('/')}"
+                >
                     {category.name}
                 </a>
             {/each}
         </div>
-        
+
         <Results
-            loadFunc={async () => await browseStore.fetch($auctionsAppState, $auctionStore, category.id)}
+            loadFunc={async () =>
+                await browseStore.fetch($auctionsAppState, $auctionStore, category.id)}
             url={`#/browse/${params.slug1}/${categories.map((c) => c.slug).join('/')}`}
             {selected}
         />

apps/frontend/components/character-table/CharacterTable.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
     import groupBy from 'lodash/groupBy';
     import sortBy from 'lodash/sortBy';
-    import { location } from 'svelte-spa-router';
+    import { router } from 'svelte-spa-router';
 
     import { browserState } from '@/shared/state/browser.svelte';
     import { settingsState } from '@/shared/state/settings.svelte';
@@ -65,7 +65,7 @@
                 filterFunc,
                 char,
                 $newNavState.characterFilter ||
-                    ($location === '/' ? settingsState.activeView.characterFilter : '')
+                    (router.location === '/' ? settingsState.activeView.characterFilter : '')
             )
         );
 

apps/frontend/components/team/Team.svelte

@@ -1,14 +1,14 @@
 <script lang="ts">
-    import { location } from 'svelte-spa-router'
+    import { router } from 'svelte-spa-router';
 
-    import { teamData } from '@/stores/team'
+    import { teamData } from '@/stores/team';
 
-    import CharacterName from './CharacterName.svelte'
-    import CharacterNote from './CharacterNote.svelte'
-    import CharacterCovenant from '@/components/common/CharacterCovenant.svelte'
-    import GearItems from '@/components/items/ItemsTableRowItems.svelte'
-    import ClassIcon from '@/shared/components/images/ClassIcon.svelte'
-    import RaceIcon from '@/shared/components/images/RaceIcon.svelte'
+    import CharacterName from './CharacterName.svelte';
+    import CharacterNote from './CharacterNote.svelte';
+    import CharacterCovenant from '@/components/common/CharacterCovenant.svelte';
+    import GearItems from '@/components/items/ItemsTableRowItems.svelte';
+    import ClassIcon from '@/shared/components/images/ClassIcon.svelte';
+    import RaceIcon from '@/shared/components/images/RaceIcon.svelte';
 </script>
 
 <style lang="scss">
@@ -33,24 +33,21 @@
                     </td>
                     <CharacterName {teamCharacter} />
                     <td
-                        class="item-level quality{teamCharacter.character.calculatedItemLevelQuality}"
+                        class="item-level quality{teamCharacter.character
+                            .calculatedItemLevelQuality}"
                     >
                         {teamCharacter.character.calculatedItemLevel}
                     </td>
-
-                    {#if $location === '/' || $location === '/gear'}
-                        <GearItems
-                            character={teamCharacter.character}
-                        />
+
+                    {#if router.location === '/' || router.location === '/gear'}
+                        <GearItems character={teamCharacter.character} />
                     {/if}
                 </tr>
                 <tr class="faction{teamCharacter.character.faction}">
                     <td>Roles</td>
                     <CharacterNote {teamCharacter} />
                     <td>
-                        <CharacterCovenant
-                            character={teamCharacter.character}
-                        />
+                        <CharacterCovenant character={teamCharacter.character} />
                     </td>
                 </tr>
             {/each}

apps/frontend/components/tooltips/task/TooltipTaskRow.svelte

@@ -152,18 +152,18 @@
                             >
                                 {#if chore.questReset === DbResetType.Daily && settingsState.value.tasks.showDailyIcon}
                                     <IconifyWrapper
-                                        icon={iconLibrary.MynauiLetterDSquare}
+                                        icon={iconLibrary.mynauiLetterDSquare}
                                         cls="quality3"
                                     />
                                 {:else if chore.questReset === DbResetType.Weekly && settingsState.value.tasks.showWeeklyIcon}
                                     <IconifyWrapper
-                                        icon={iconLibrary.MynauiLetterWSquare}
+                                        icon={iconLibrary.mynauiLetterWSquare}
                                         cls="quality3"
                                     />
                                 {/if}
                                 {#if chore.accountWide && settingsState.value.tasks.showAccountIcon}
                                     <IconifyWrapper
-                                        icon={iconLibrary.MynauiLetterASquare}
+                                        icon={iconLibrary.mynauiLetterASquare}
                                         cls="status-shrug"
                                     />
                                 {/if}
@@ -239,13 +239,13 @@
     {#if settingsState.value.tasks.showIconLegend}
         <div class="bottom" style:--scale="1.2">
             <span>
-                <IconifyWrapper icon={iconLibrary.MynauiLetterDSquare} cls="quality3" /> Daily
+                <IconifyWrapper icon={iconLibrary.mynauiLetterDSquare} cls="quality3" /> Daily
             </span>
             <span>
-                <IconifyWrapper icon={iconLibrary.MynauiLetterWSquare} cls="quality3" /> Weekly
+                <IconifyWrapper icon={iconLibrary.mynauiLetterWSquare} cls="quality3" /> Weekly
             </span>
             <span>
-                <IconifyWrapper icon={iconLibrary.MynauiLetterASquare} cls="status-shrug" /> Account
+                <IconifyWrapper icon={iconLibrary.mynauiLetterASquare} cls="status-shrug" /> Account
             </span>
         </div>
     {/if}

apps/frontend/data/professions/cooldowns.ts

@@ -43,6 +43,13 @@ export const expansionProfessionConcentration: Record<number, Record<number, num
 // cooldown of 0 = "use the addon data"
 export const professionCooldowns: (ProfessionCooldownQuest | ProfessionCooldownSpell)[] = [
     // Alchemy
+    {
+        type: 'spell',
+        key: 'midAlchemyBouquet',
+        name: '[Mid] Bouquet of Herbs',
+        profession: Profession.Alchemy,
+        cooldown: [[0]],
+    },
     {
         type: 'spell',
         key: 'midAlchemyWondrous',

apps/frontend/data/tasks/10-the-war-within/delves.ts

@@ -25,7 +25,7 @@ export const twwDelves: Task = {
         {
             key: 'gilded',
             name: 'Gilded Stash',
-            icon: iconLibrary.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: iconLibrary.GameTreasureMap,
+            icon: iconLibrary.gameTreasureMap,
             minimumLevel: 80,
             alwaysStarted: true,
             questReset: DbResetType.Weekly,

apps/frontend/data/tasks/11-midnight/delves.ts

@@ -12,7 +12,7 @@ export const midDelves: Task = {
         // {
         //     key: 'map',
         //     name: '{item:252415}',
-        //     icon: iconLibrary.GameTreasureMap,
+        //     icon: iconLibrary.gameTreasureMap,
         //     minimumLevel: 80,
         //     alwaysStarted: true,
         //     questReset: DbResetType.Weekly,

apps/frontend/data/tasks/11-midnight/prey.ts

@@ -45,8 +45,8 @@ export const midPrey: Task = {
             questCount: 2,
             questReset: DbResetType.Weekly,
             questIds: [93168, 93156],
-            canGetFunc: (char) =>
-                userState.quests.characterById.get(char.id)?.hasQuestById?.has(NORMAL_UNLOCK)
+            canGetFunc: () =>
+                userState.quests.anyCharacterHasById.has(NORMAL_UNLOCK)
                     ? ''
                     : Strings.doUnlockQuests,
         },
@@ -61,7 +61,7 @@ export const midPrey: Task = {
             questIds: [93169, 93857],
             couldGetFunc: () => renownFunc(1),
             canGetFunc: (char) =>
-                userState.quests.characterById.get(char.id)?.hasQuestById?.has(HEROIC_UNLOCK)
+                userState.quests.anyCharacterHasById.has(HEROIC_UNLOCK)
                     ? ''
                     : Strings.doUnlockQuests,
         },
@@ -76,7 +76,7 @@ export const midPrey: Task = {
             questIds: [93170, 93861],
             couldGetFunc: () => renownFunc(4),
             canGetFunc: (char) =>
-                userState.quests.characterById.get(char.id)?.hasQuestById?.has(NIGHTMARE_UNLOCK)
+                userState.quests.anyCharacterHasById.has(NIGHTMARE_UNLOCK)
                     ? ''
                     : Strings.doUnlockQuests,
         },
@@ -89,7 +89,7 @@ export const midPrey: Task = {
             questIds: [94446],
             couldGetFunc: () => renownFunc(4),
             canGetFunc: (char) =>
-                userState.quests.characterById.get(char.id)?.hasQuestById?.has(NIGHTMARE_UNLOCK)
+                userState.quests.anyCharacterHasById.has(NIGHTMARE_UNLOCK)
                     ? ''
                     : Strings.doUnlockQuests,
         },