From 3dbb977d47f0d744d0e91eb155674520007f4221 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Wed, 24 Sep 2025 03:29:15 -0700 Subject: [PATCH] update database pages to use image utils --- src/routes/database/characters/[id]/+page.svelte | 9 +++++---- src/routes/database/summons/[id]/+page.svelte | 10 +++++----- src/routes/database/weapons/[id]/+page.svelte | 11 +++-------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/routes/database/characters/[id]/+page.svelte b/src/routes/database/characters/[id]/+page.svelte index f5e797db..d056f187 100644 --- a/src/routes/database/characters/[id]/+page.svelte +++ b/src/routes/database/characters/[id]/+page.svelte @@ -18,6 +18,7 @@ import DetailItem from '$lib/components/ui/DetailItem.svelte' import DetailsHeader from '$lib/components/ui/DetailsHeader.svelte' import Button from '$lib/components/ui/Button.svelte' + import { getCharacterImage } from '$lib/utils/images' // Types import type { PageData } from './$types' @@ -182,9 +183,9 @@ } // Helper function to get character image - function getCharacterImage(character: any): string { - if (!character?.granblueId) return '/images/placeholders/placeholder-character-main.png' - return `/images/character-grid/${character.granblueId}_01.jpg` + // Helper function for character grid image + function getCharacterGridImage(character: any): string { + return getCharacterImage(character?.granblueId, 'grid', '01') } // Calculate uncap properties for the indicator @@ -208,7 +209,7 @@ {#if summon}
- + diff --git a/src/routes/database/weapons/[id]/+page.svelte b/src/routes/database/weapons/[id]/+page.svelte index 818201eb..adf8b191 100644 --- a/src/routes/database/weapons/[id]/+page.svelte +++ b/src/routes/database/weapons/[id]/+page.svelte @@ -5,6 +5,7 @@ import { getRarityLabel } from '$lib/utils/rarity' import { getElementLabel, getElementIcon } from '$lib/utils/element' import { getProficiencyLabel, getProficiencyIcon } from '$lib/utils/proficiency' + import { getWeaponGridImage } from '$lib/utils/images' import UncapIndicator from '$lib/components/uncap/UncapIndicator.svelte' import DetailsContainer from '$lib/components/ui/DetailsContainer.svelte' import DetailItem from '$lib/components/ui/DetailItem.svelte' @@ -16,15 +17,9 @@ // Get weapon from server data const weapon = $derived(data.weapon) - // Helper function to get weapon image + // Helper function to get weapon grid image function getWeaponImage(weapon: any): string { - if (!weapon?.granblueId) return '/images/placeholders/placeholder-weapon-main.png' - - // Handle element-specific weapons (primal weapons) - if (weapon.element === 0 && weapon.instanceElement) { - return `/images/weapon-grid/${weapon.granblueId}_${weapon.instanceElement}.jpg` - } - return `/images/weapon-grid/${weapon.granblueId}.jpg` + return getWeaponGridImage(weapon?.granblueId, weapon?.element, weapon?.instanceElement) } // Calculate uncap properties for the indicator