Skip to content
Merged

Deploy #1807

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 @@ -17,7 +17,7 @@
<td class="border-left" data-tooltip="Addon data processed for this character">
{#if character.lastSeenAddon}
{@const diff = timeState.slowTime.diff(character.lastSeenAddon).toMillis()}
<code>{@html toNiceDuration(diff)}</code>
<code>{@html toNiceDuration(diff, { includeZero: true })}</code>
{:else}
???
{/if}
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/components/home/view-switcher/Holiday.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<code class="stats {getPercentClass(stats.percent)}">{stats.have}/{stats.total}</code>
<span class="remaining">
{activeHoliday.soon ? 'starts ' : 'ends '}
<code>{toNiceDuration(remainingTime, false, 7)}</code>
<code>{toNiceDuration(remainingTime, { maxDays: 7, useNbsp: false })}</code>
</span>
</div>
{/snippet}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<div class="flex-wrapper" class:faded={notLearned}>
<div class="remaining">
<code class:status-warn={timeRemaining < 43200000}>
{@html toNiceDuration(timeRemaining, true)}
{@html toNiceDuration(timeRemaining)}
</code>
</div>
<div class="quality border-left">
Expand Down
24 changes: 24 additions & 0 deletions apps/frontend/components/vendors/VendorsOptions.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<script lang="ts">
import { iconStrings } from '@/data/icons';
import { uiIcons } from '@/shared/icons';
import { browserState } from '@/shared/state/browser.svelte';
import { setAllCheckboxes } from '@/utils/html/set-all-checkboxes';

import CheckboxInput from '@/shared/components/forms/CheckboxInput.svelte';
import IconifyWrapper from '@/shared/components/images/IconifyWrapper.svelte';
Expand Down Expand Up @@ -122,6 +124,22 @@
}
</style>

{#snippet selectAllNone()}
<button
class="margin-left"
data-tooltip="Select All"
onclick={(event) => setAllCheckboxes(event.currentTarget, '.filters-container', true)}
>
<IconifyWrapper icon={uiIcons.selectAll} />
</button>
<button
data-tooltip="Select None"
onclick={(event) => setAllCheckboxes(event.currentTarget, '.filters-container', false)}
>
<IconifyWrapper icon={uiIcons.selectNone} />
</button>
{/snippet}

<div class="options-container">
<button>
<CheckboxInput
Expand Down Expand Up @@ -215,6 +233,8 @@
>Weapons</CheckboxInput
>
</button>

{@render selectAllNone()}
</div>

<div class="options-container filters-container">
Expand Down Expand Up @@ -264,6 +284,8 @@
>Toys</CheckboxInput
>
</button>

{@render selectAllNone()}
</div>

<div class="options-container filters-container">
Expand All @@ -287,5 +309,7 @@
bind:value={browserState.current.vendors.showAwakened}>Awakened</CheckboxInput
>
</button>

{@render selectAllNone()}
</div>
{/if}
6 changes: 6 additions & 0 deletions apps/frontend/data/professions/hidden.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const hiddenSkillLineAbilitySpellIds = new Set<number>([
// Tailoring > Cloth Scavenging
59390, 343634, 392396,
// Tailoring > Profession Ranks
3908, 3909, 3910, 12180, 26790, 51309, 75156, 110426, 158758, 195126,
]);
48 changes: 48 additions & 0 deletions apps/frontend/data/tasks/05-warlords-of-draenor/garrisons.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { GarrisonType } from '@/enums/garrison-type';
import { iconLibrary } from '@/shared/icons';
import { DbResetType } from '@/shared/stores/db/enums';
import type { Character } from '@/types';
import type { Task } from '@/types/tasks';

const hasGarrison = (char: Character) =>
char.garrisons?.[GarrisonType.WarlordsOfDraenor]?.level > 0;

export const wodChoresGarrison: Task = {
key: 'wodGarrison',
name: '[WoD] Garrison',
shortName: 'Gar',
showSeparate: true,
chores: [
{
key: 'wodGarrisonInvasion',
name: 'Invasion',
icon: iconLibrary.gameBunkerAssault,
alwaysStarted: true,
questReset: DbResetType.Weekly,
questResetForced: true,
couldGetFunc: hasGarrison,
subChores: [
{
key: 'bronze',
name: 'Bronze - {item:120320}',
questIds: [37638],
},
{
key: 'silver',
name: 'Silver - {item:120319}',
questIds: [37639],
},
{
key: 'gold',
name: 'Gold - {item:116980}',
questIds: [37640],
},
{
key: 'platinum',
name: 'Platinum - {item:122163}',
questIds: [38482],
},
],
},
],
};
3 changes: 3 additions & 0 deletions apps/frontend/data/tasks/05-warlords-of-draenor/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { wodChoresGarrison } from './garrisons';

export const wodTasks = [wodChoresGarrison];
31 changes: 30 additions & 1 deletion apps/frontend/data/tasks/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,30 @@
export * from './task-list';
import { wodTasks } from './05-warlords-of-draenor';
import { bfaTasks } from './07-battle-for-azeroth';
import { slTasks } from './08-shadowlands';
import { dfTasks } from './09-dragonflight';
import { twwTasks } from './10-the-war-within';
import { midTasks } from './11-midnight';
import { eventTasks } from './events';
import { pvpTasks } from './pvp';
import type { Task } from '@/types/tasks';

export const taskList: Task[] = [
...eventTasks,
...pvpTasks,
...bfaTasks,
...wodTasks,
...slTasks,
...dfTasks,
...twwTasks,
...midTasks,
];

export const taskMap: Record<string, Task> = Object.fromEntries(
taskList.map((task) => [task.key, task])
);

export const taskChoreMap = Object.fromEntries(
taskList.flatMap((task) =>
task.chores.filter((chore) => !!chore).map((chore) => [`${task.key}_${chore.key}`, chore])
)
);
33 changes: 0 additions & 33 deletions apps/frontend/data/tasks/old-events.ts

This file was deleted.

Loading
Loading