Skip to content
Merged

Deploy #1778

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
2 changes: 1 addition & 1 deletion apps/frontend/components/home/view-switcher/Delves.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
dynamicDelves.map(({ poiId, story }) => [
delveMap[poiId],
story,
settingsState.value.delveRankings[`${poiId}:${story}`],
settingsState.value.delveRankings[`${poiId}:${story}`] || 0,
]) as [Delve, string, number][],
([delve, , ranking]) => `${9 - ranking}:${delve.shortName}`
);
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/shared/icons/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const uiIcons = {
no: iconLibrary.mdiClose,
plus: iconLibrary.mdiPlus,
question: iconLibrary.mdiQuestionMark,
random: iconLibrary.gameDiceRandom,
starEmpty: iconLibrary.mdiStarOutline,
starHalf: iconLibrary.mdiStarHalfFull,
starFull: iconLibrary.mdiStarFace,
Expand Down
6 changes: 6 additions & 0 deletions apps/frontend/shared/state/browser.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ interface BrowserStateIdk {
showCollected: boolean;
showUncollected: boolean;
};
transmogSets: {
mythicOnly: boolean;
};
vendors: {
filtersExpanded: boolean;

Expand Down Expand Up @@ -282,6 +285,9 @@ const initialState: BrowserStateIdk = {
showCollected: true,
showUncollected: true,
},
transmogSets: {
mythicOnly: false,
},
vendors: {
filtersExpanded: false,
highlightMissing: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { Constants } from '@/data/constants';
import { transmogSets } from '@/data/transmog';
import { iconLibrary, uiIcons } from '@/shared/icons';
import { browserState } from '@/shared/state/browser.svelte';
import { settingsState } from '@/shared/state/settings.svelte';
import { userStore } from '@/stores';
import { transmogSetsState } from '@/stores/local-storage';
Expand All @@ -15,6 +16,7 @@

import { tradingPostKeys } from './data';

import CheckboxInput from '@/shared/components/forms/CheckboxInput.svelte';
import ClassIcon from '@/shared/components/images/ClassIcon.svelte';
import CovenantIcon from '@/shared/components/images/CovenantIcon.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
Expand All @@ -36,6 +38,11 @@
);
let setKey = $derived(slugs.join('--'));

let raidWithMythic = $derived(
(category.name === 'Raids' || slugs.includes('raids')) &&
category.groups.some((group) => group.sets.includes('Mythic'))
);

const getTransmogSets = function (group: ManualDataTransmogGroup): TransmogSetData[] {
if (group.type === 'multi') {
return Object.keys(group.data).map(
Expand Down Expand Up @@ -157,9 +164,7 @@
color: var(--color-success);
}
.percent {
position: absolute;
right: 0.5rem;
word-spacing: -0.2ch;
word-spacing: -0.3ch;
}
.percent-cell {
--width: 3.4rem;
Expand Down Expand Up @@ -193,13 +198,23 @@

<tr class="sticky">
<td class="category-name" colspan="2">
{category.name}

{#if showPercent}
<span class="drop-shadow percent {getPercentClass(categoryPercent)}">
{Math.floor(categoryPercent).toFixed(0)} %
</span>
{/if}
<div class="flex-wrapper">
<span>{category.name}</span>

{#if raidWithMythic}
<CheckboxInput
name="mythic_only"
bind:value={browserState.current.transmogSets.mythicOnly}
>Mythic only</CheckboxInput
>
{/if}

{#if showPercent}
<span class="drop-shadow percent {getPercentClass(categoryPercent)}">
{Math.floor(categoryPercent).toFixed(0)} %
</span>
{/if}
</div>
</td>

{#if currentType === 'covenant'}
Expand Down Expand Up @@ -363,7 +378,7 @@
{/if}

{#if isExpanded}
{#each getFilteredSets(settingsState.value, $userStore, group) as [setShow, setName], setIndex}
{#each getFilteredSets(settingsState.value, $userStore, group, raidWithMythic) as [setShow, setName], setIndex}
{#if setShow}
{@const setPercent = getPercent(groupIndex, setIndex)}
<tr class:faded={setName.endsWith('*')}>
Expand Down
12 changes: 8 additions & 4 deletions apps/frontend/utils/transmog/get-filtered-sets.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { browserState } from '@/shared/state/browser.svelte';
import type { Settings } from '@/shared/stores/settings/types';
import type { UserData } from '@/types';
import type { ManualDataTransmogGroup, ManualDataTransmogGroupData } from '@/types/data/manual';
Expand All @@ -6,12 +7,14 @@ export default function getFilteredSets(
settings: Settings,
userData: UserData,
group: ManualDataTransmogGroup,
raidWithMythic: boolean
): [boolean, string][] {
const ret: [boolean, string][] = [];

const skipAlliance = !settings.transmog.showAllianceOnly;
const skipHorde = !settings.transmog.showHordeOnly;
const skipUnavailable = settings.collections.hideUnavailable;
const skipNonMythic = raidWithMythic && browserState.current.transmogSets.mythicOnly;

for (let setIndex = 0; setIndex < group.sets.length; setIndex++) {
const setName = group.sets[setIndex];
Expand All @@ -23,8 +26,9 @@ export default function getFilteredSets(
setName.endsWith('*') &&
!hasAnyOfSets(
userData,
Object.values(group.data).map((datas) => datas[setIndex]),
))
Object.values(group.data).map((datas) => datas[setIndex])
)) ||
(skipNonMythic && setName !== 'Mythic')
),
setName,
]);
Expand All @@ -36,7 +40,7 @@ export default function getFilteredSets(
function hasAnyOfSets(userData: UserData, sets: ManualDataTransmogGroupData[]): boolean {
return sets.some((set) =>
Object.values(set.items || {}).some((itemIds) =>
itemIds.some((itemId) => userData.hasAppearance.has(itemId)),
),
itemIds.some((itemId) => userData.hasAppearance.has(itemId))
)
);
}
Loading