updates
All checks were successful
Build and Deploy / Build & Push Image (push) Successful in 36s

This commit is contained in:
2026-03-25 21:10:53 -06:00
parent 01f4fc0ff7
commit 694a10bdbe
2 changed files with 19 additions and 29 deletions

View File

@@ -248,25 +248,8 @@ defmodule CobblemonUi.TypeChart do
def type_text_color(_), do: "text-base-content/50" def type_text_color(_), do: "text-base-content/50"
@doc """ @doc """
Returns a heroicon name for each type. Returns the static asset path for a type's SVG icon.
""" """
def type_icon("normal"), do: "hero-minus-circle" def type_icon_path(type) when type in @types, do: "/images/types/#{type}.svg"
def type_icon("fire"), do: "hero-fire" def type_icon_path(_), do: nil
def type_icon("water"), do: "hero-beaker"
def type_icon("grass"), do: "hero-puzzle-piece"
def type_icon("electric"), do: "hero-bolt"
def type_icon("ice"), do: "hero-cloud"
def type_icon("fighting"), do: "hero-hand-raised"
def type_icon("poison"), do: "hero-beaker"
def type_icon("ground"), do: "hero-globe-americas"
def type_icon("flying"), do: "hero-paper-airplane"
def type_icon("psychic"), do: "hero-eye"
def type_icon("bug"), do: "hero-bug-ant"
def type_icon("rock"), do: "hero-cube"
def type_icon("ghost"), do: "hero-moon"
def type_icon("dragon"), do: "hero-star"
def type_icon("dark"), do: "hero-moon"
def type_icon("steel"), do: "hero-shield-check"
def type_icon("fairy"), do: "hero-sparkles"
def type_icon(_), do: "hero-question-mark-circle"
end end

View File

@@ -386,7 +386,7 @@ defmodule CobblemonUiWeb.PokemonComponents do
phx-click="select_type" phx-click="select_type"
phx-value-type={t} phx-value-type={t}
class={[ class={[
"inline-flex items-center gap-1 px-2.5 py-1.5 rounded-lg text-xs font-semibold capitalize transition-all duration-150 border cursor-pointer", "inline-flex items-center gap-1.5 px-2.5 py-1.5 rounded-lg text-xs font-semibold capitalize transition-all duration-150 border cursor-pointer",
if(@selected_type == t, if(@selected_type == t,
do: "ring-2 ring-primary/60 border-primary/40 bg-base-100 shadow-md scale-105", do: "ring-2 ring-primary/60 border-primary/40 bg-base-100 shadow-md scale-105",
else: else:
@@ -395,9 +395,11 @@ defmodule CobblemonUiWeb.PokemonComponents do
]} ]}
> >
<span class={[ <span class={[
"inline-block w-2.5 h-2.5 rounded-full shrink-0", "inline-flex items-center justify-center w-5 h-5 rounded-full shrink-0 p-0.5",
type_bg(@selected_type == t, t) TypeChart.type_color(t)
]} /> ]}>
<img src={TypeChart.type_icon_path(t)} alt={t} class="w-3.5 h-3.5" />
</span>
{t} {t}
</button> </button>
</div> </div>
@@ -411,7 +413,11 @@ defmodule CobblemonUiWeb.PokemonComponents do
"w-12 h-12 rounded-xl flex items-center justify-center shrink-0 shadow-sm", "w-12 h-12 rounded-xl flex items-center justify-center shrink-0 shadow-sm",
TypeChart.type_color(@selected_type) TypeChart.type_color(@selected_type)
]}> ]}>
<.icon name={TypeChart.type_icon(@selected_type)} class="size-6 text-white drop-shadow" /> <img
src={TypeChart.type_icon_path(@selected_type)}
alt={@selected_type}
class="w-7 h-7 drop-shadow"
/>
</div> </div>
<div> <div>
<h4 class="font-bold text-base-content capitalize text-xl">{@selected_type}</h4> <h4 class="font-bold text-base-content capitalize text-xl">{@selected_type}</h4>
@@ -568,15 +574,16 @@ defmodule CobblemonUiWeb.PokemonComponents do
"text-white border-white/10" "text-white border-white/10"
]} ]}
> >
<.icon name={TypeChart.type_icon(@type_name)} class="size-3 drop-shadow" /> <img
src={TypeChart.type_icon_path(@type_name)}
alt={@type_name}
class="w-3.5 h-3.5 drop-shadow"
/>
{@type_name} {@type_name}
</button> </button>
""" """
end end
defp type_bg(true, type), do: TypeChart.type_color(type)
defp type_bg(false, type), do: TypeChart.type_color(type) <> "/60"
# --- Helpers --- # --- Helpers ---
defp gender_symbol("male"), do: "" defp gender_symbol("male"), do: ""