@itsmrtr/bunkoshelf 1.2.9 → 1.3.1

package/dist/src/app/[lang]/favorites/others/volumes/page.tsx

@@ -0,0 +1,53 @@
+import { Suspense } from "react";
+import { getDictionary } from "@/lib/i18n/Dictionary";
+import VolumesIndexFav from "@/components/library/manga/grid/VolumesIndexFav";
+import type { Locale } from "@/lib/types";
+
+interface FavoritesOthersVolumesPageProps {
+  params: Promise<{ lang: string }>;
+  searchParams: Promise<Record<string, string | undefined>>;
+}
+
+function GridSkeleton() {
+  return (
+    <section className="p-4">
+      <div className="h-7 w-48 rounded bg-sand animate-pulse mb-4" />
+      <div className="grid grid-cols-3 md:grid-cols-5 2xl:grid-cols-7 gap-4">
+        {Array.from({ length: 7 }).map((_, i) => (
+          <div key={i} className="aspect-[3/5] rounded-lg bg-sand animate-pulse" />
+        ))}
+      </div>
+    </section>
+  );
+}
+
+async function FavoritesOthersVolumesContent({
+  params,
+  searchParams,
+}: FavoritesOthersVolumesPageProps) {
+  const { lang = "es" } = await params;
+  const resolvedSearchParams = await searchParams;
+  const pageRaw = resolvedSearchParams.page ?? "1";
+  const page = Number.parseInt(pageRaw, 10) || 1;
+  const intl = await getDictionary(lang as Locale);
+
+  return (
+    <VolumesIndexFav
+      lang={lang as Locale}
+      intl={intl}
+      page={page}
+      scope="others"
+      section="others"
+    />
+  );
+}
+
+export default function FavoritesOthersVolumesPage(
+  props: FavoritesOthersVolumesPageProps
+) {
+  return (
+    <Suspense fallback={<GridSkeleton />}>
+      <FavoritesOthersVolumesContent {...props} />
+    </Suspense>
+  );
+}

package/dist/src/app/[lang]/favorites/page.tsx

@@ -1,52 +1,11 @@
-import { Suspense } from "react";
-import { getDictionary } from "@/lib/i18n/Dictionary";
-import SeriesIndexFav from "@/components/library/manga/grid/SeriesIndexFav";
-import VolumesIndexFav from "@/components/library/manga/grid/VolumesIndexFav";
-import Separator from "@/components/ui/Separator";
-import { getLibraryScope } from "@/lib/librarySection";
-import type { Locale } from "@/lib/types";
+import { redirect } from "next/navigation";
 
 interface FavoritesPageProps {
   params: Promise<{ lang: string }>;
 }
 
-function GridSkeleton() {
-  return (
-    <section className="p-4">
-      <div className="h-7 w-48 rounded bg-sand animate-pulse mb-4" />
-      <div className="grid grid-cols-3 md:grid-cols-5 2xl:grid-cols-7 gap-4">
-        {Array.from({ length: 7 }).map((_, i) => (
-          <div key={i} className="aspect-[3/5] rounded-lg bg-sand animate-pulse" />
-        ))}
-      </div>
-    </section>
-  );
-}
-
-async function FavoritesSeries({ params }: { params: Promise<{ lang: string }> }) {
-  const { lang = "es" } = await params;
-  const intl = await getDictionary(lang as Locale);
-  const scope = getLibraryScope("manga");
-  return <SeriesIndexFav lang={lang as Locale} intl={intl} scope={scope} />;
-}
-
-async function FavoritesVolumes({ params }: { params: Promise<{ lang: string }> }) {
+export default async function FavoritesPage({ params }: FavoritesPageProps) {
   const { lang = "es" } = await params;
-  const intl = await getDictionary(lang as Locale);
-  const scope = getLibraryScope("manga");
-  return <VolumesIndexFav lang={lang as Locale} intl={intl} scope={scope} />;
-}
 
-export default function FavoritesPage({ params }: FavoritesPageProps) {
-  return (
-    <>
-      <Suspense fallback={<GridSkeleton />}>
-        <FavoritesSeries params={params} />
-      </Suspense>
-      <Separator />
-      <Suspense fallback={<GridSkeleton />}>
-        <FavoritesVolumes params={params} />
-      </Suspense>
-    </>
-  );
+  redirect(`/${lang}/favorites/manga`);
 }

package/dist/src/app/[lang]/manga/[series]/page.tsx

@@ -6,23 +6,22 @@ import { verifySession } from "@/lib/auth/verifySession";
 import { listVolumeRatings, findSeriesFavoriteState } from "@/lib/db/reading";
 import { getDictionary } from "@/lib/i18n/Dictionary";
 import {
-  findSeriesBySlug,
-  type LibraryVolumeMetadata,
+  findSeriesBySlugBasic,
+  listPagedVolumes,
+  type SeriesVolumeAggregate,
+  listSeriesVolumeAggregates,
+  listVolumeProgressByIds,
 } from "@/lib/db/library";
 import {
   getLibrarySection,
   getLibrarySeriesHref,
 } from "@/lib/librarySection";
 import { getMangaCoverUrl } from "@/lib/mangaCover";
-import { sortByPaddedTitle } from "@/lib/utils";
+import { LIBRARY_PAGE_SIZE } from "@/lib/libraryPagination";
 import type { Locale } from "@/lib/types";
 
-interface AggregatedMeta {
-  [key: string]: string[];
-}
-
 function aggregateMetadata(
-  volumes: { metadataObj?: LibraryVolumeMetadata | null }[]
+  volumes: SeriesVolumeAggregate[]
 ) {
   const fields = [
     "writer", "penciller", "inker", "colorist", "letterer",
@@ -35,10 +34,8 @@ function aggregateMetadata(
   }
 
   for (const vol of volumes) {
-    const meta = vol.metadataObj;
-    if (!meta) continue;
     for (const key of fields) {
-      const raw = meta[key];
+      const raw = vol[key];
       if (typeof raw === "string" && raw.trim() !== "") {
         raw.split(",").forEach((entry) => {
           aggregated[key].add(entry.trim());
@@ -47,7 +44,7 @@ function aggregateMetadata(
     }
   }
 
-  const result: AggregatedMeta = {};
+  const result: Record<string, string[]> = {};
   for (const key of fields) {
     result[key] = Array.from(aggregated[key]);
   }
@@ -57,23 +54,24 @@ function aggregateMetadata(
 
 interface SeriesMangaPageProps {
   params: Promise<{ lang: string; series: string }>;
+  searchParams: Promise<Record<string, string | undefined>>;
 }
 
 async function SeriesMangaPageContent({
   params,
+  searchParams,
 }: SeriesMangaPageProps) {
   const { lang = "es", series } = await params;
+  const resolvedSearchParams = await searchParams;
+  const pageRaw = resolvedSearchParams.page ?? "1";
+  const parsedPage = parseInt(pageRaw, 10);
+  const page = Number.isNaN(parsedPage) || parsedPage < 1 ? 1 : parsedPage;
   const intl = await getDictionary(lang as Locale);
 
   try {
     const user = await verifySession();
 
-    const serie = await findSeriesBySlug({
-      slug: series,
-      userId: user?.id ?? null,
-      includeGenres: true,
-      includeTags: true,
-    });
+    const serie = await findSeriesBySlugBasic(series);
 
     if (!serie) {
       return (
@@ -83,44 +81,80 @@ async function SeriesMangaPageContent({
       );
     }
 
-    const targetSection = getLibrarySection(serie.volumes[0]?.metadataObj?.mangaStyle);
+    const [firstVolumePage, volumePage, aggregateVolumes] = await Promise.all([
+      listPagedVolumes({
+        page: 1,
+        pageSize: 1,
+        seriesIds: [serie.id],
+        includeGenres: true,
+        includeTags: true,
+      }),
+      listPagedVolumes({
+        page,
+        pageSize: LIBRARY_PAGE_SIZE,
+        seriesIds: [serie.id],
+      }),
+      listSeriesVolumeAggregates(serie.id),
+    ]);
+
+    const firstVolume = firstVolumePage.items[0] ?? null;
+
+    if (!firstVolume) {
+      return (
+        <div className="text-center mt-8">
+          {(intl?.errors?.notFound as string) || "Serie no encontrada."}
+        </div>
+      );
+    }
+
+    const targetSection = getLibrarySection(firstVolume.metadataObj?.mangaStyle);
 
     if (targetSection !== "manga") {
       redirect(getLibrarySeriesHref(lang, targetSection, serie.slug));
     }
 
+    const progressById = user
+      ? await listVolumeProgressByIds(
+          user.id,
+          volumePage.items.map((volume) => volume.id)
+        )
+      : {};
+
+    const paginatedVolumes = volumePage.items.map((vol) => {
+      const meta = {
+        ...(vol.metadataObj || null),
+        genres: [],
+        tags: [],
+      };
+
+      return {
+        ...vol,
+        usersProgress: progressById[vol.id] ? [progressById[vol.id]] : [],
+        coverImage: getMangaCoverUrl(vol),
+        meta,
+      };
+    });
+
     const normalizedSerie = {
       ...serie,
       coverImage: getMangaCoverUrl({
-        slug: serie.volumes?.[0]?.slug ?? "",
-        coverImage: serie.volumes?.[0]?.coverImage ?? null,
-        updatedAt: serie.volumes?.[0]?.updatedAt,
+        slug: firstVolume.slug,
+        coverImage: firstVolume.coverImage ?? null,
+        updatedAt: firstVolume.updatedAt,
       }),
-      volumes:
-        serie.volumes?.map((vol) => {
-          const meta = {
-            ...(vol.metadataObj || null),
-            genres: Array.isArray(vol.genres)
-              ? vol.genres
-                  .map((genre) => (genre.name ? { name: genre.name.trim() } : null))
-                  .filter(Boolean)
-              : [],
-            tags: Array.isArray(vol.tags)
-              ? vol.tags
-                  .map((tag) => (tag.name ? { name: tag.name.trim() } : null))
-                  .filter(Boolean)
-              : [],
-          };
-          return {
-            ...vol,
-            coverImage: getMangaCoverUrl(vol),
-            meta,
-          };
-        }) ?? [],
+      meta: {
+        ...(firstVolume.metadataObj || null),
+        genres: (firstVolume.genres ?? [])
+          .map((genre) => (genre.name ? { name: genre.name.trim() } : null))
+          .filter(Boolean),
+        tags: (firstVolume.tags ?? [])
+          .map((tag) => (tag.name ? { name: tag.name.trim() } : null))
+          .filter(Boolean),
+      },
+      volumes: paginatedVolumes,
     };
 
-    const sortedVolumes = sortByPaddedTitle(normalizedSerie.volumes);
-    const aggregatedMeta = aggregateMetadata(sortedVolumes);
+    const aggregatedMeta = aggregateMetadata(aggregateVolumes);
 
     let isFavorite = false;
     let averageRating: number | null = null;
@@ -128,11 +162,11 @@ async function SeriesMangaPageContent({
     if (user) {
       isFavorite = await findSeriesFavoriteState(user.id, serie.id);
 
-      const volumeIds = serie.volumes.map((v) => v.id);
+      const volumeIds = aggregateVolumes.map((volume) => volume.id);
       const personalMap = await listVolumeRatings(user.id, volumeIds);
 
-      const ratings = serie.volumes
-        .map((v) => personalMap.get(v.id) ?? v.metadataObj?.communityRating)
+      const ratings = aggregateVolumes
+        .map((volume) => personalMap.get(volume.id) ?? volume.communityRating)
         .filter((r): r is number => r !== null && r !== undefined);
 
       if (ratings.length > 0) {
@@ -143,13 +177,20 @@ async function SeriesMangaPageContent({
 
     return (
       <SeriesContent
-        serieData={{ ...normalizedSerie, volumes: sortedVolumes }}
+        serieData={normalizedSerie}
         lang={lang as Locale}
         intl={intl}
         isFavorite={isFavorite}
-        aggregatedMeta={aggregatedMeta}
+        aggregatedMeta={{
+          ...aggregatedMeta,
+          genres: normalizedSerie.meta.genres as { name: string }[],
+          tags: normalizedSerie.meta.tags as { name: string }[],
+        }}
         averageRating={averageRating}
         user={user}
+        currentPage={volumePage.page}
+        totalPages={volumePage.totalPages}
+        totalVolumes={volumePage.total}
         section="manga"
       />
     );
@@ -166,10 +207,13 @@ async function SeriesMangaPageContent({
   }
 }
 
-export default function SeriesMangaPage({ params }: SeriesMangaPageProps) {
+export default function SeriesMangaPage({
+  params,
+  searchParams,
+}: SeriesMangaPageProps) {
   return (
     <Suspense fallback={<DetailSkeleton kind="series" />}>
-      <SeriesMangaPageContent params={params} />
+      <SeriesMangaPageContent params={params} searchParams={searchParams} />
     </Suspense>
   );
 }

package/dist/src/app/[lang]/others/[series]/page.tsx

@@ -6,23 +6,22 @@ import { verifySession } from "@/lib/auth/verifySession";
 import { listVolumeRatings, findSeriesFavoriteState } from "@/lib/db/reading";
 import { getDictionary } from "@/lib/i18n/Dictionary";
 import {
-  findSeriesBySlug,
-  type LibraryVolumeMetadata,
+  findSeriesBySlugBasic,
+  listPagedVolumes,
+  type SeriesVolumeAggregate,
+  listSeriesVolumeAggregates,
+  listVolumeProgressByIds,
 } from "@/lib/db/library";
 import {
   getLibrarySection,
   getLibrarySeriesHref,
 } from "@/lib/librarySection";
 import { getMangaCoverUrl } from "@/lib/mangaCover";
-import { sortByPaddedTitle } from "@/lib/utils";
+import { LIBRARY_PAGE_SIZE } from "@/lib/libraryPagination";
 import type { Locale } from "@/lib/types";
 
-interface AggregatedMeta {
-  [key: string]: string[];
-}
-
 function aggregateMetadata(
-  volumes: { metadataObj?: LibraryVolumeMetadata | null }[]
+  volumes: SeriesVolumeAggregate[]
 ) {
   const fields = [
     "writer", "penciller", "inker", "colorist", "letterer",
@@ -35,10 +34,8 @@ function aggregateMetadata(
   }
 
   for (const vol of volumes) {
-    const meta = vol.metadataObj;
-    if (!meta) continue;
     for (const key of fields) {
-      const raw = meta[key];
+      const raw = vol[key];
       if (typeof raw === "string" && raw.trim() !== "") {
         raw.split(",").forEach((entry) => {
           aggregated[key].add(entry.trim());
@@ -47,7 +44,7 @@ function aggregateMetadata(
     }
   }
 
-  const result: AggregatedMeta = {};
+  const result: Record<string, string[]> = {};
   for (const key of fields) {
     result[key] = Array.from(aggregated[key]);
   }
@@ -57,23 +54,24 @@ function aggregateMetadata(
 
 interface OthersSeriesPageProps {
   params: Promise<{ lang: string; series: string }>;
+  searchParams: Promise<Record<string, string | undefined>>;
 }
 
 async function OthersSeriesPageContent({
   params,
+  searchParams,
 }: OthersSeriesPageProps) {
   const { lang = "es", series } = await params;
+  const resolvedSearchParams = await searchParams;
+  const pageRaw = resolvedSearchParams.page ?? "1";
+  const parsedPage = parseInt(pageRaw, 10);
+  const page = Number.isNaN(parsedPage) || parsedPage < 1 ? 1 : parsedPage;
   const intl = await getDictionary(lang as Locale);
 
   try {
     const user = await verifySession();
 
-    const serie = await findSeriesBySlug({
-      slug: series,
-      userId: user?.id ?? null,
-      includeGenres: true,
-      includeTags: true,
-    });
+    const serie = await findSeriesBySlugBasic(series);
 
     if (!serie) {
       return (
@@ -83,44 +81,80 @@ async function OthersSeriesPageContent({
       );
     }
 
-    const targetSection = getLibrarySection(serie.volumes[0]?.metadataObj?.mangaStyle);
+    const [firstVolumePage, volumePage, aggregateVolumes] = await Promise.all([
+      listPagedVolumes({
+        page: 1,
+        pageSize: 1,
+        seriesIds: [serie.id],
+        includeGenres: true,
+        includeTags: true,
+      }),
+      listPagedVolumes({
+        page,
+        pageSize: LIBRARY_PAGE_SIZE,
+        seriesIds: [serie.id],
+      }),
+      listSeriesVolumeAggregates(serie.id),
+    ]);
+
+    const firstVolume = firstVolumePage.items[0] ?? null;
+
+    if (!firstVolume) {
+      return (
+        <div className="text-center mt-8">
+          {(intl?.errors?.notFound as string) || "Serie no encontrada."}
+        </div>
+      );
+    }
+
+    const targetSection = getLibrarySection(firstVolume.metadataObj?.mangaStyle);
 
     if (targetSection !== "others") {
       redirect(getLibrarySeriesHref(lang, targetSection, serie.slug));
     }
 
+    const progressById = user
+      ? await listVolumeProgressByIds(
+          user.id,
+          volumePage.items.map((volume) => volume.id)
+        )
+      : {};
+
+    const paginatedVolumes = volumePage.items.map((vol) => {
+      const meta = {
+        ...(vol.metadataObj || null),
+        genres: [],
+        tags: [],
+      };
+
+      return {
+        ...vol,
+        usersProgress: progressById[vol.id] ? [progressById[vol.id]] : [],
+        coverImage: getMangaCoverUrl(vol),
+        meta,
+      };
+    });
+
     const normalizedSerie = {
       ...serie,
       coverImage: getMangaCoverUrl({
-        slug: serie.volumes?.[0]?.slug ?? "",
-        coverImage: serie.volumes?.[0]?.coverImage ?? null,
-        updatedAt: serie.volumes?.[0]?.updatedAt,
+        slug: firstVolume.slug,
+        coverImage: firstVolume.coverImage ?? null,
+        updatedAt: firstVolume.updatedAt,
       }),
-      volumes:
-        serie.volumes?.map((vol) => {
-          const meta = {
-            ...(vol.metadataObj || null),
-            genres: Array.isArray(vol.genres)
-              ? vol.genres
-                  .map((genre) => (genre.name ? { name: genre.name.trim() } : null))
-                  .filter(Boolean)
-              : [],
-            tags: Array.isArray(vol.tags)
-              ? vol.tags
-                  .map((tag) => (tag.name ? { name: tag.name.trim() } : null))
-                  .filter(Boolean)
-              : [],
-          };
-          return {
-            ...vol,
-            coverImage: getMangaCoverUrl(vol),
-            meta,
-          };
-        }) ?? [],
+      meta: {
+        ...(firstVolume.metadataObj || null),
+        genres: (firstVolume.genres ?? [])
+          .map((genre) => (genre.name ? { name: genre.name.trim() } : null))
+          .filter(Boolean),
+        tags: (firstVolume.tags ?? [])
+          .map((tag) => (tag.name ? { name: tag.name.trim() } : null))
+          .filter(Boolean),
+      },
+      volumes: paginatedVolumes,
     };
 
-    const sortedVolumes = sortByPaddedTitle(normalizedSerie.volumes);
-    const aggregatedMeta = aggregateMetadata(sortedVolumes);
+    const aggregatedMeta = aggregateMetadata(aggregateVolumes);
 
     let isFavorite = false;
     let averageRating: number | null = null;
@@ -128,11 +162,11 @@ async function OthersSeriesPageContent({
     if (user) {
       isFavorite = await findSeriesFavoriteState(user.id, serie.id);
 
-      const volumeIds = serie.volumes.map((v) => v.id);
+      const volumeIds = aggregateVolumes.map((volume) => volume.id);
       const personalMap = await listVolumeRatings(user.id, volumeIds);
 
-      const ratings = serie.volumes
-        .map((v) => personalMap.get(v.id) ?? v.metadataObj?.communityRating)
+      const ratings = aggregateVolumes
+        .map((volume) => personalMap.get(volume.id) ?? volume.communityRating)
         .filter((r): r is number => r !== null && r !== undefined);
 
       if (ratings.length > 0) {
@@ -143,13 +177,20 @@ async function OthersSeriesPageContent({
 
     return (
       <SeriesContent
-        serieData={{ ...normalizedSerie, volumes: sortedVolumes }}
+        serieData={normalizedSerie}
         lang={lang as Locale}
         intl={intl}
         isFavorite={isFavorite}
-        aggregatedMeta={aggregatedMeta}
+        aggregatedMeta={{
+          ...aggregatedMeta,
+          genres: normalizedSerie.meta.genres as { name: string }[],
+          tags: normalizedSerie.meta.tags as { name: string }[],
+        }}
         averageRating={averageRating}
         user={user}
+        currentPage={volumePage.page}
+        totalPages={volumePage.totalPages}
+        totalVolumes={volumePage.total}
         section="others"
       />
     );
@@ -166,10 +207,13 @@ async function OthersSeriesPageContent({
   }
 }
 
-export default function OthersSeriesPage({ params }: OthersSeriesPageProps) {
+export default function OthersSeriesPage({
+  params,
+  searchParams,
+}: OthersSeriesPageProps) {
   return (
     <Suspense fallback={<DetailSkeleton kind="series" />}>
-      <OthersSeriesPageContent params={params} />
+      <OthersSeriesPageContent params={params} searchParams={searchParams} />
     </Suspense>
   );
 }