diff --git a/bun.lock b/bun.lock index 9c145de..ca93c4a 100644 --- a/bun.lock +++ b/bun.lock @@ -11,8 +11,7 @@ "drizzle-orm": "^0.45.3", }, "devDependencies": { - "@fontsource-variable/onest": "^5.3.1", - "@fontsource-variable/unbounded": "^5.3.0", + "@fontsource-variable/archivo": "^5.3.0", "@internationalized/date": "^3.12.4", "@lucide/svelte": "^1.48.0", "@sveltejs/adapter-vercel": "^6.3.4", @@ -131,9 +130,7 @@ "@floating-ui/utils": ["@floating-ui/utils@0.2.12", "", {}, "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww=="], - "@fontsource-variable/onest": ["@fontsource-variable/onest@5.3.1", "", {}, "sha512-xaaw6G4HDB2/RczsWLD/2bnib4ykmQlTlBUN3GOEOiyErilZukQWVJG95h9zwAy0i8KY+QzDa+COPfqhI72Acw=="], - - "@fontsource-variable/unbounded": ["@fontsource-variable/unbounded@5.3.0", "", {}, "sha512-ea565Ncn4r7gPdBEHcmaF31V11hDfkL7b/JCklLobQbMfbu2ZZQrVWNgdeEFWFLqNh36yhieZWOgxdAnMTzrLg=="], + "@fontsource-variable/archivo": ["@fontsource-variable/archivo@5.3.0", "", {}, "sha512-HogK8FJelrD1o7TlZlkIVtHgc20bO5PZRWE7mUeUTdMN055alznQV6/00J00IBeu8FQAH4s3zW9UJNvKExXf+g=="], "@internationalized/date": ["@internationalized/date@3.12.4", "", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-M1dEn4c1U1HsSlaVR8upZtSqvXrTkHDfv18H01uCSJyjVLDxnBR38v/fMxecmlwXKR4i9HeZcmgQAPE6A+aGJQ=="], diff --git a/package.json b/package.json index 8dd58c5..7cb9838 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,7 @@ "drizzle-orm": "^0.45.3" }, "devDependencies": { - "@fontsource-variable/onest": "^5.3.1", - "@fontsource-variable/unbounded": "^5.3.0", + "@fontsource-variable/archivo": "^5.3.0", "@internationalized/date": "^3.12.4", "@lucide/svelte": "^1.48.0", "@sveltejs/adapter-vercel": "^6.3.4", diff --git a/src/lib/assets/favicon.svg b/src/lib/assets/favicon.svg index c0f5513..d9b85bc 100644 --- a/src/lib/assets/favicon.svg +++ b/src/lib/assets/favicon.svg @@ -1 +1 @@ - + diff --git a/src/lib/components/compare/stat-comparison.svelte b/src/lib/components/compare/stat-comparison.svelte index 6a59046..aaf6894 100644 --- a/src/lib/components/compare/stat-comparison.svelte +++ b/src/lib/components/compare/stat-comparison.svelte @@ -31,15 +31,15 @@
| Type | + {#each STAT_KEYS as key (key)} + {@render header(key, STAT_LABELS[key].short, `Sort by ${STAT_LABELS[key].long}`, "hidden w-14 lg:table-cell")} + {/each} + {@render header("total", "Total", "Sort by base stat total", "hidden w-16 pr-2 lg:table-cell")} + {@render header(compactKey, compactLabel, "Sort by this figure", "w-16 pr-2 lg:hidden")} +|||||
|---|---|---|---|---|---|
| + {dexNumber(entry.speciesId)} + | +
+
+
+
+
+
+ {dexNumber(entry.speciesId)} + + {entry.name} + +
+ {#each entry.types as type (type)}
+
+ |
+
+
+ {#each entry.types as type (type)}
+
+ |
+ {#each STAT_KEYS as key, i (key)}
+ + {entry.stats[i]} + | + {/each} +{statTotal(entry)} | +{figure(entry, compactKey)} | +
{dexNumber(entry.speciesId)}
+{dexNumber(entry.speciesId)}
{entry.name}
diff --git a/src/lib/components/dex/type-filter.svelte b/src/lib/components/dex/type-filter.svelte index 52aba4b..f72d4c2 100644 --- a/src/lib/components/dex/type-filter.svelte +++ b/src/lib/components/dex/type-filter.svelte @@ -16,7 +16,7 @@