+ Track your progress towards a complete Living Pokédex — one of every Pokémon, actively
+ maintained across your boxes. Join thousands of trainers worldwide.
+
- Track your progress towards a complete Living Pokédex — one of every Pokémon, actively
- maintained across your boxes. Join thousands of trainers worldwide.
-
+ A Living Dex is a complete Pokédex where you keep one of every Pokémon in your boxes
+ (often including forms/variants). Living Dex Tracker helps you build and maintain that
+ collection with filters, notes, and progress tracking.
+
+
+
+
+
+
+
+
+
+
Why Choose Living Dex Tracker?
+
+
+
+
+
+
+
+
+
+
Social & Shareable
+
+ Easily share your Pokédex journey with friends, or find theirs. If you'd rather go
+ it alone, that's okay too!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Free & Open Source
+
+ Completely open source and free to use, enabling the community to contribute updates
+ as soon as new Pokémon are released.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Advanced Filtering
+
+ Track simple progress or tackle harder variants like a Living Origin Form Dex with
+ our powerful filtering options for targeted catching sessions.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
100% free
+
+ Did we mention it's completely free to use? Oh, we did? Good. Because it is.
+
+
+
+
+
+
+
+
+
+
+
+
+
Ready to Start Your Journey?
+
+ Get started today with tracking your Living Pokédex progress. It's free, open source, and
+ built with love for the Pokémon community.
+
+
-
Get Started Free
+
Sign Up Now
+
-
-
-
-
-
-
Pokémon caught
-
{pokemonCaught}
-
-
-
Users
-
{users}
-
-
-
Living Dexes Completed
-
{livingDexesCompleted}
-
+
+
+
+
+
+
Legal Disclaimer
+
+ Living Dex Tracker is a fan-made project. We do not claim ownership of any Pokémon
+ characters, images, or other content featured on this website. This project is not
+ affiliated with, endorsed, sponsored, or specifically approved by Nintendo, Game Freak, or
+ The Pokémon Company.
+
-
-
-
-
-
-
-
What is a Living Dex?
-
- A Living Dex is a complete Pokédex where you keep one of every Pokémon in your boxes
- (often including forms/variants). Living Dex Tracker helps you build and maintain that
- collection with filters, notes, and progress tracking.
-
-
-
-
-
-
-
-
-
-
Why Choose Living Dex Tracker?
-
-
-
-
-
-
-
-
-
-
Social & Shareable
-
- Easily share your Pokédex journey with friends, or find theirs. If you'd rather go
- it alone, that's okay too!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Free & Open Source
-
- Completely open source and free to use, enabling the community to contribute
- updates as soon as new Pokémon are released.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Advanced Filtering
-
- Track simple progress or tackle harder variants like a Living Origin Form Dex with
- our powerful filtering options for targeted catching sessions.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
100% free
-
- Did we mention it's completely free to use? Oh, we did? Good. Because it is.
-
-
-
-
-
-
-
-
-
-
-
-
-
Ready to Start Your Journey?
-
- Get started today with tracking your Living Pokédex progress. It's free, open source, and
- built with love for the Pokémon community.
-
-
-
-
-
Sign Up Now
-
-
-
-
-
-
-
-
-
-
-
-
-
Legal Disclaimer
-
- Living Dex Tracker is a fan-made project. We do not claim ownership of any Pokémon
- characters, images, or other content featured on this website. This project is not
- affiliated with, endorsed, sponsored, or specifically approved by Nintendo, Game Freak,
- or The Pokémon Company.
-
-
-
-
-
-{/if}
+
diff --git a/src/routes/api/pokedexes/[id]/combined-data/+server.ts b/src/routes/api/pokedexes/[id]/combined-data/+server.ts
index 31bcbc6..89b6cce 100644
--- a/src/routes/api/pokedexes/[id]/combined-data/+server.ts
+++ b/src/routes/api/pokedexes/[id]/combined-data/+server.ts
@@ -1,9 +1,8 @@
import { json } from '@sveltejs/kit';
-import CombinedDataRepository from '$lib/repositories/CombinedDataRepository';
import PokedexRepository from '$lib/repositories/PokedexRepository';
import { getOptionalUserId } from '$lib/utils/auth';
import type { RequestEvent } from '@sveltejs/kit';
-import { resolveDexScopes } from '$lib/services/PokedexDexScopeService';
+import { loadCombinedDataPage } from '$lib/services/CombinedDataService';
// GET: Get combined data (pokédex entries + catch records) for specific pokédex
export const GET = async (event: RequestEvent) => {
@@ -23,48 +22,29 @@ export const GET = async (event: RequestEvent) => {
const region = url.searchParams.get('region') || '';
const game = url.searchParams.get('game') || '';
- // If authenticated, verify user owns this pokédex and get its gameScope
- let pokedex;
- if (userId) {
- const pokedexRepo = new PokedexRepository(event.locals.supabase, userId);
- pokedex = await pokedexRepo.findById(pokedexId);
-
- if (!pokedex) {
- // User is authenticated but doesn't own this pokédex (or it doesn't exist)
- return json({ error: 'Pokedex not found' }, { status: 404 });
- }
- } else {
+ if (!userId) {
// Anonymous users cannot view pokédexes
return json({ error: 'Unauthorized' }, { status: 401 });
}
- // Use pokédex's gameScope as default filter if no manual game filter is set
- const effectiveGame = game || pokedex.gameScope || '';
- const dexScopes = await resolveDexScopes(event.locals.supabase, pokedex);
+ // Verify the user owns this pokédex and get its gameScope
+ const pokedexRepo = new PokedexRepository(event.locals.supabase, userId);
+ const pokedex = await pokedexRepo.findById(pokedexId);
- const repo = new CombinedDataRepository(event.locals.supabase, userId, pokedexId);
+ if (!pokedex) {
+ // User is authenticated but doesn't own this pokédex (or it doesn't exist)
+ return json({ error: 'Pokedex not found' }, { status: 404 });
+ }
- // Get paginated combined data
- const combinedData = await repo.findCombinedData(
- userId!,
- page,
- limit,
- enableForms,
- region,
- effectiveGame,
- dexScopes
+ return json(
+ await loadCombinedDataPage(event.locals.supabase, userId, pokedex, {
+ page,
+ limit,
+ enableForms,
+ region,
+ game
+ })
);
-
- // Get total count for pagination
- const totalCount = await repo.countCombinedData(enableForms, region, effectiveGame, dexScopes);
- const totalPages = Math.ceil(totalCount / limit);
-
- return json({
- combinedData,
- totalPages,
- currentPage: page,
- totalCount
- });
} catch (err) {
console.error(err);
if (err && typeof err === 'object' && 'status' in err) {
diff --git a/src/routes/api/stats/+server.ts b/src/routes/api/stats/+server.ts
index 4fa83f8..0125f20 100644
--- a/src/routes/api/stats/+server.ts
+++ b/src/routes/api/stats/+server.ts
@@ -27,6 +27,10 @@ export const GET = async (event: RequestEvent) => {
}
const stats = data[0];
+ // The figures refresh at most daily, so let browsers and the CDN reuse them.
+ event.setHeaders({
+ 'cache-control': 'public, max-age=300, s-maxage=3600, stale-while-revalidate=86400'
+ });
return json({
pokemonCaught: stats.pokemon_caught,
users: stats.total_users,
diff --git a/src/routes/offline-guide/+page.svelte b/src/routes/offline-guide/+page.svelte
index ced2df6..1da1fe5 100644
--- a/src/routes/offline-guide/+page.svelte
+++ b/src/routes/offline-guide/+page.svelte
@@ -15,6 +15,10 @@
Using Offline - Living Dex Tracker
+
diff --git a/src/routes/pokedex/[id]/+page.server.ts b/src/routes/pokedex/[id]/+page.server.ts
index 8b4fd69..594d306 100644
--- a/src/routes/pokedex/[id]/+page.server.ts
+++ b/src/routes/pokedex/[id]/+page.server.ts
@@ -1,7 +1,11 @@
import { error, redirect } from '@sveltejs/kit';
import PokedexRepository from '$lib/repositories/PokedexRepository';
+import { loadCombinedDataPage } from '$lib/services/CombinedDataService';
import type { PageServerLoad } from './$types';
+// Must match the page's itemsPerPage: the box view needs the whole dex in one page.
+const INITIAL_PAGE_SIZE = 9999;
+
export const load: PageServerLoad = async ({ locals, params }) => {
const { safeGetSession, supabase } = locals;
const { session, user } = await safeGetSession();
@@ -22,7 +26,22 @@ export const load: PageServerLoad = async ({ locals, params }) => {
throw error(404, 'Pokédex not found');
}
+ // Streamed rather than awaited: the page shell renders straight away and the entries arrive in
+ // the same response, instead of the browser requesting them after hydration. A failure resolves
+ // to null so the page falls back to fetching (and reporting) through the API.
+ const initialCombinedData = loadCombinedDataPage(supabase, user.id, pokedex, {
+ page: 1,
+ limit: INITIAL_PAGE_SIZE,
+ enableForms: pokedex.isFormDex
+ })
+ .then((result) => result.combinedData)
+ .catch((err) => {
+ console.error('Unable to preload combined data', err);
+ return null;
+ });
+
return {
- pokedex
+ pokedex,
+ initialCombinedData
};
};
diff --git a/src/routes/pokedex/[id]/+page.svelte b/src/routes/pokedex/[id]/+page.svelte
index 9eea078..5df77dc 100644
--- a/src/routes/pokedex/[id]/+page.svelte
+++ b/src/routes/pokedex/[id]/+page.svelte
@@ -502,8 +502,35 @@
});
}
- // Fetch data whenever pagination controls change (client-side only)
- $: if (browser && pokedexId) getData({ page: currentPage, perPage: itemsPerPage });
+ // Show data whenever the dex or pagination changes (client-side only). The first page is streamed
+ // from the server load, so it only needs fetching when that failed or the page changes.
+ let shownKey = '';
+ function showPage(
+ id: string,
+ page: number,
+ perPage: number,
+ initial: Promise | undefined
+ ) {
+ const key = `${id}:${page}:${perPage}`;
+ if (key === shownKey) return;
+ shownKey = key;
+ if (page !== 1 || !initial) {
+ void getData({ page, perPage });
+ return;
+ }
+ combinedData = null;
+ void initial.then((rows) => {
+ if (shownKey !== key) return;
+ if (!rows) {
+ void getData({ page, perPage });
+ return;
+ }
+ combinedData = rows;
+ boxNumbers = calculateBoxNumbers(rows.length);
+ });
+ }
+ $: if (browser && pokedexId)
+ showPage(pokedexId, currentPage, itemsPerPage, data?.initialCombinedData);
onMount(() => {
if (!browser) return;
diff --git a/src/routes/welcome/+page.svelte b/src/routes/welcome/+page.svelte
index 41d3888..1d6ea6d 100644
--- a/src/routes/welcome/+page.svelte
+++ b/src/routes/welcome/+page.svelte
@@ -22,8 +22,12 @@