Skip to content
Merged

Deploy #1722

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { iconLibrary } from '@/shared/icons';
import type { RenameRequest } from './types';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';

let renameRequests: RenameRequest[];

Expand Down Expand Up @@ -65,7 +65,7 @@
</tr>
</thead>
<tbody>
{#each renameRequests as renameRequest}

Check warning on line 68 in apps/frontend/admin/components/rename-requests/RenameRequests.svelte

View workflow job for this annotation

GitHub Actions / Lint

Each block should have a key
<tr>
<td class="id">{renameRequest.id}</td>
<td class="name">{renameRequest.userName}</td>
Expand All @@ -74,18 +74,18 @@
>
<td class="action status-success">
{#if !renameRequest.inUse}
<IconifyIcon
<IconifyWrapper
icon={iconLibrary.mdiCheck}
tooltip="Approve request"
on:click={async () => await approveRequest(renameRequest.id)}
onclick={async () => await approveRequest(renameRequest.id)}
/>
{/if}
</td>
<td class="action status-fail">
<IconifyIcon
<IconifyWrapper
icon={iconLibrary.mdiClose}
tooltip="Decline request"
on:click={async () => await declineRequest(renameRequest.id)}
onclick={async () => await declineRequest(renameRequest.id)}
/>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/auctions/components/results/Selected.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { wowthingData } from '@/shared/stores/data';
import { leftPad } from '@/utils/formatting';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';

export let selected: string;

Expand Down Expand Up @@ -69,7 +69,7 @@
<td class="price"></td>
</tr>
{:then auctions}
{#each auctions as auction}

Check warning on line 72 in apps/frontend/auctions/components/results/Selected.svelte

View workflow job for this annotation

GitHub Actions / Lint

Each block should have a key
{@const realm = wowthingData.static.connectedRealmById.get(
auction.connectedRealmId
)}
Expand All @@ -79,7 +79,7 @@
{#if realm.region === Region.EU && euLocales[realm.locale]}
{@const { icon: countryIcon, name: countryName } =
euLocales[realm.locale]}
<IconifyIcon
<IconifyWrapper
dropShadow={true}
icon={countryIcon}
tooltip={`EU: ${countryName}`}
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/components/achievements/Achievement.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import AchievementLink from '@/shared/components/links/AchievementLink.svelte';
import Criteria from './Criteria.svelte';
import FactionIcon from '@/shared/components/images/FactionIcon.svelte';
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 achievementId: number;
Expand Down Expand Up @@ -267,7 +267,7 @@

{#if chain.length > 0}
<div class="chain">
{#each chain as chainId}

Check warning on line 270 in apps/frontend/components/achievements/Achievement.svelte

View workflow job for this annotation

GitHub Actions / Lint

Each block should have a key
{@const chainEarned = userState.achievements.achievementEarnedById.has(chainId)}
<div class="chain-icon" class:completed={chainEarned}>
<AchievementLink id={chainId}>
Expand All @@ -282,7 +282,7 @@

{#if chainId === achievementId}
<div class="abs-center chain-current drop-shadow">
<IconifyIcon icon={iconStrings['arrow-up']} />
<IconifyWrapper icon={iconStrings['arrow-up']} />
</div>
{/if}
</div>
Expand Down
44 changes: 22 additions & 22 deletions apps/frontend/components/appearances/AppearancesItem.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<svelte:options immutable={true} />

<script lang="ts">
import { itemModifierMap } from '@/data/item-modifier';
import { appearanceState } from '@/stores/local-storage';
Expand All @@ -9,28 +7,30 @@
import WowheadLink from '@/shared/components/links/WowheadLink.svelte';
import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';

export let has: boolean;
export let modifiedAppearance: AppearanceDataModifiedAppearance;

let bonusId: number;
let difficulty: string;
let difficultyShort: string;
let imageName: string;
$: {
const mod = modifiedAppearance;
type Props = {
has: boolean;
modifiedAppearance: AppearanceDataModifiedAppearance;
};
let { has, modifiedAppearance }: Props = $props();

imageName = `item/${mod.itemId}`;
if (mod.modifier > 0) {
imageName += `_${mod.modifier}`;
}
let imageName = $derived(
'item/' +
[
modifiedAppearance.itemId.toString(),
...(modifiedAppearance.modifier > 0
? [modifiedAppearance.modifier.toString()]
: []
).join('_'),
]
);

if (itemModifierMap[mod.modifier]) {
[difficulty, difficultyShort, bonusId] = itemModifierMap[mod.modifier];
} else {
const modifierString = mod.modifier.toString();
[difficulty, difficultyShort, bonusId] = [modifierString, modifierString, 0];
}
}
let [difficulty, difficultyShort, bonusId] = $derived(
itemModifierMap[modifiedAppearance.modifier] || [
modifiedAppearance.modifier.toString(),
modifiedAppearance.modifier.toString(),
0,
]
);
</script>

<style lang="scss">
Expand Down
6 changes: 3 additions & 3 deletions apps/frontend/components/auctions/AuctionsExtraPets.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import { getColumnResizer } from '@/utils/get-column-resizer';
import petLocationTooltip from '@/utils/pet-location-tooltip';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import Paginate from '@/shared/components/paginate/Paginate.svelte';
import WowheadLink from '@/shared/components/links/WowheadLink.svelte';
import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';
Expand Down Expand Up @@ -99,7 +99,7 @@
{:then things}
<Paginate items={things} perPage={20} {page} let:paginated>
<div class="wrapper" bind:this={wrapperDiv}>
{#each paginated as thing}

Check warning on line 102 in apps/frontend/components/auctions/AuctionsExtraPets.svelte

View workflow job for this annotation

GitHub Actions / Lint

Each block should have a key
{@const auctions = $auctionState.limitToBestRealms
? thing.auctions.slice(0, 5)
: thing.auctions}
Expand Down Expand Up @@ -153,8 +153,8 @@
data-location={pet.location}
data-tooltip={petLocationTooltip(pet)}
>
<IconifyIcon
extraClass="drop-shadow"
<IconifyWrapper
cls="drop-shadow"
icon={itemLocationIcons[pet.location]}
scale="0.9"
/>
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/components/auctions/AuctionsMissing.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import connectedRealmName from '@/utils/connected-realm-name';
import { getColumnResizer } from '@/utils/get-column-resizer';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import Paginate from '@/shared/components/paginate/Paginate.svelte';
import RealmTooltip from './RealmTooltip.svelte';
import WowheadLink from '@/shared/components/links/WowheadLink.svelte';
Expand Down Expand Up @@ -226,7 +226,7 @@
{#if connectedRealm.region === Region.EU && euLocales[connectedRealm.locale]}
{@const { icon: countryIcon, name: countryName } =
euLocales[connectedRealm.locale]}
<IconifyIcon
<IconifyWrapper
dropShadow={true}
icon={countryIcon}
tooltip={`EU: ${countryName}`}
Expand Down
21 changes: 12 additions & 9 deletions apps/frontend/components/auctions/AuctionsMissingBigResults.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import type { ItemDataItem } from '@/types/data/item';

import FactionIcon from '@/shared/components/images/FactionIcon.svelte';
import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import Paginate from '@/shared/components/paginate/Paginate.svelte';
import ParsedText from '@/shared/components/parsed-text/ParsedText.svelte';
import ProfessionIcon from '@/shared/components/images/ProfessionIcon.svelte';
Expand Down Expand Up @@ -403,15 +403,15 @@

<span class="icons">
{#if needSource && !needAppearance}
<IconifyIcon
extraClass="status-shrug"
<IconifyWrapper
cls="status-shrug"
icon={iconLibrary.mdiWizardHat}
scale="0.85"
tooltip="You have collected this appearance from another item"
/>
{:else if needAppearance}
<IconifyIcon
extraClass="status-fail"
<IconifyWrapper
cls="status-fail"
icon={iconLibrary.mdiWizardHat}
scale="0.85"
tooltip="You have not collected this appearance"
Expand All @@ -428,7 +428,7 @@
},
}}
>
<IconifyIcon
<IconifyWrapper
icon={iconLibrary.mdiAlertOutline}
scale="0.9"
/>
Expand All @@ -440,7 +440,7 @@
onclick={() =>
navigator.clipboard.writeText(item.name)}
>
<IconifyIcon
<IconifyWrapper
icon={iconLibrary.mdiClipboardPlusOutline}
scale="0.9"
/>
Expand Down Expand Up @@ -490,7 +490,7 @@
{#if connectedRealm.region === Region.EU && euLocales[connectedRealm.locale]}
{@const { icon: countryIcon, name: countryName } =
euLocales[connectedRealm.locale]}
<IconifyIcon
<IconifyWrapper
dropShadow={true}
icon={countryIcon}
tooltip={`EU: ${countryName}`}
Expand Down Expand Up @@ -542,7 +542,10 @@
data-tooltip="Copy shopping list to clipboard"
onclick={() => exportShoppingList()}
>
<IconifyIcon icon={iconLibrary.mdiClipboardPlusOutline} scale="0.9" />
<IconifyWrapper
icon={iconLibrary.mdiClipboardPlusOutline}
scale="0.9"
/>
</button>
</span>
<span
Expand Down
3 changes: 1 addition & 2 deletions apps/frontend/components/auctions/RealmTooltip.svelte
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<script lang="ts">
import sortBy from 'lodash/sortBy';

import { settingsState } from '@/shared/state/settings.svelte';
import CharacterTag from '@/user-home/components/character/CharacterTag.svelte';
import { userState } from '@/user-home/state/user';
import type { StaticDataConnectedRealm } from '@/shared/stores/static/types';
import CharacterTag from '@/user-home/components/character/CharacterTag.svelte';

type Props = {
ageInMinutes: number;
Expand Down
6 changes: 3 additions & 3 deletions apps/frontend/components/auctions/commodities/Table.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import type { CharacterCommodities } from './get-character-commodities';
import type { CommodityData } from './store';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import ParsedText from '@/shared/components/parsed-text/ParsedText.svelte';
import WowheadLink from '@/shared/components/links/WowheadLink.svelte';
import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';
Expand Down Expand Up @@ -77,9 +77,9 @@
<thead>
<tr>
<td class="character-realm" colspan="2">
<IconifyIcon
<IconifyWrapper
icon={isExpanded ? uiIcons.minus : uiIcons.plus}
on:click={() =>
onclick={() =>
($commoditiesState.expanded[characterData.characterId] = !isExpanded)}
tooltip={isExpanded ? 'Collapse this character' : 'Expand this character'}
/>
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/components/character-table/head/BagSpace.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { iconLibrary } from '@/shared/icons';
import type { SortableProps } from '@/types/props';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';

let { getSortState, setSortState }: SortableProps = $props();
</script>
Expand All @@ -15,5 +15,5 @@
onclick={() => setSortState()}
data-tooltip="Free Bag Slots"
>
<IconifyIcon icon={iconLibrary.gameBackpack} scale="0.9" />
<IconifyWrapper icon={iconLibrary.gameBackpack} scale="0.9" />
</td>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { iconLibrary } from '@/shared/icons';
import type { SortableProps } from '@/types/props';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';

let { getSortState, setSortState }: SortableProps = $props();
</script>
Expand All @@ -15,5 +15,5 @@
onclick={() => setSortState()}
data-tooltip="Movement Speed"
>
<IconifyIcon icon={iconLibrary.mdiRunFast} scale="0.9" />
<IconifyWrapper icon={iconLibrary.mdiRunFast} scale="0.9" />
</td>
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
let { character }: CharacterProps = $props();

let worldVault = $derived(character.isMaxLevel ? character.weekly?.vault?.worldProgress : []);
// tier 5 could be hard prey

function qualityFunc(prog: CharacterWeeklyProgress): number {
return getWorldTier(prog.level)[1];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import type {
Character,
CharacterSubProfession,
Expansion,
ExpansionData,
MultiSlugParams,
UserCount,
} from '@/types';
Expand All @@ -25,7 +25,7 @@
export let staticProfession: StaticDataProfession;

let charSubProfession: CharacterSubProfession;
let expansion: Expansion;
let expansion: ExpansionData;
let filteredCategories: Record<number, StaticDataProfessionAbility[]>;
let hasFirstCraft: boolean;
let knownRecipes: Set<number>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { uiIcons } from '@/shared/icons';
import type { StaticDataProfessionAbility } from '@/shared/stores/static/types';

import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import WowheadLink from '@/shared/components/links/WowheadLink.svelte';

type Props = {
Expand Down Expand Up @@ -39,7 +39,7 @@
id={index === 0 ? ability.spellId : ability.extraRanks[index - 1][1]}
type="spell"
>
<IconifyIcon
<IconifyWrapper
icon={index < currentRank && userHas ? uiIcons.starFull : uiIcons.starEmpty}
/>
</WowheadLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import CraftLevels from './CharacterProfessionsProfessionCraftLevels.svelte';
import FactionIcon from '@/shared/components/images/FactionIcon.svelte';
import IconifyIcon from '@/shared/components/images/IconifyIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
import ParsedText from '@/shared/components/parsed-text/ParsedText.svelte';
import SkillRanks from './CharacterProfessionsProfessionSkillRanks.svelte';
import WowheadLink from '@/shared/components/links/WowheadLink.svelte';
Expand Down Expand Up @@ -224,8 +224,8 @@
{@const hasCrafted = userState.quests.characterById
.get(character.id)
.hasQuestById.has(ability.firstCraftQuestId)}
<IconifyIcon
extraClass={hasCrafted
<IconifyWrapper
cls={hasCrafted
? 'status-success'
: 'status-fail'}
icon={hasCrafted ? uiIcons.yes : uiIcons.no}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { expansionSlugMap } from '@/data/expansion';
import type { Character, Expansion, MultiSlugParams } from '@/types';
import type { Character, ExpansionData, MultiSlugParams } from '@/types';
import type {
StaticDataProfession,
StaticDataSubProfession,
Expand All @@ -15,7 +15,7 @@
export let staticProfession: StaticDataProfession;

let charTraits: Record<number, number>;
let expansion: Expansion;
let expansion: ExpansionData;
let subProfession: StaticDataSubProfession;
$: {
expansion = expansionSlugMap[params.slug5];
Expand Down
Loading
Loading