Skip to content
Merged

Deploy #1752

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
24 changes: 11 additions & 13 deletions apps/frontend/components/appearances/Appearances.svelte
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
<script lang="ts">
import { afterUpdate } from 'svelte'
import getSavedRoute from '@/utils/get-saved-route';
import type { ParamsSlugsProps } from '@/types/props';

import getSavedRoute from '@/utils/get-saved-route'
import type { MultiSlugParams } from '@/types'
import Sidebar from './AppearancesSidebar.svelte';
import View from './AppearancesView.svelte';

import Sidebar from './AppearancesSidebar.svelte'
import View from './AppearancesView.svelte'
type Props = ParamsSlugsProps & { basePath?: string };
let { basePath, params }: Props = $props();

export let basePath = ''
export let params: MultiSlugParams

afterUpdate(() => getSavedRoute(basePath ? `${basePath}/appearances` : 'appearances', params.slug1))
$effect(() =>
getSavedRoute(basePath ? `${basePath}/appearances` : 'appearances', params.slug1)
);
</script>

<div class="view">
<Sidebar {basePath} />

{#if params.slug1}
<View
{params}
/>
<View {params} />
{/if}
</div>
6 changes: 3 additions & 3 deletions apps/frontend/components/appearances/AppearancesItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
modifiedAppearance.itemId.toString(),
...(modifiedAppearance.modifier > 0
? [modifiedAppearance.modifier.toString()]
: []
).join('_'),
]
: []),
].join('_')
);

let [difficulty, difficultyShort, bonusId] = $derived(
Expand Down Expand Up @@ -53,6 +52,7 @@
class="appearance-item quality{modifiedAppearance.quality}"
class:missing={(has && $appearanceState.highlightMissing) ||
(!has && !$appearanceState.highlightMissing)}
data-modifier={modifiedAppearance.modifier}
>
<WowheadLink
id={modifiedAppearance.itemId}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<SectionTitle count={lazyState.appearances.stats[dataSlug]} title={name} />

<div class="collection-v2-section">
{#each sets as set}
{#each sets as set (set.name)}
<Set slug={`${dataSlug}--${set.name}`} {set} />
{/each}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ export function getRenownData({
ret.dataRep.id === Constants.reputations.delveBrann ||
ret.dataRep.id === Constants.reputations.delveValeera
) {
console.log(ret);
const levelMatch = ret.repTier.name.match(/(\d{1,3})$/);
if (levelMatch) {
const oof =
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/user-home/state/activeViewTasks.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ActiveViewTasks {
if (chore.requiredHolidays?.length > 0) {
if (
chore.requiredHolidays.some(
(holidayId) => !!activeHolidays.value[holidayId]
(holidayId) => activeHolidays.value[holidayId]?.soon === false
)
) {
activeChores.push(chore);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/Views/Shared/_ManifestCss.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

@foreach (string cssFilename in FrontendManifest.Entrypoints[Model].Css)
{
<link rel="stylesheet" href="https://@WebOptions.Value.Hostname/@cssFilename">
<link rel="stylesheet" href="/@cssFilename">
}
2 changes: 1 addition & 1 deletion apps/web/Views/Shared/_ManifestJs.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

@foreach (string jsFilename in FrontendManifest.Entrypoints[Model].Js)
{
<script type="module" src="https://@WebOptions.Value.Hostname/@jsFilename"></script>
<script type="module" src="/@jsFilename"></script>
}
Loading