feat: add navigation to book reader from series page - Add book click handler in PaginatedBookGrid - Simplify BookGrid component with direct navigation - Keep book status and metadata display - Ensure consistent navigation behavior across the app
This commit is contained in:
@@ -99,7 +99,7 @@ Créer une application web moderne avec Next.js permettant de lire des fichiers
|
||||
- [x] Responsive design
|
||||
- [x] Page d'accueil
|
||||
- [x] Présentation des fonctionnalités principales
|
||||
- [ ] Liste des collections récentes
|
||||
- [x] Liste des collections récentes
|
||||
- [ ] Barre de recherche
|
||||
- [ ] Filtres avancés
|
||||
- [ ] Tri personnalisable
|
||||
|
||||
@@ -30,6 +30,7 @@ export default function BookPage({ params }: { params: { bookId: string } }) {
|
||||
}
|
||||
const data = await response.json();
|
||||
setData(data);
|
||||
setIsReading(true);
|
||||
} catch (error) {
|
||||
console.error("Erreur:", error);
|
||||
setError(error instanceof Error ? error.message : "Une erreur est survenue");
|
||||
@@ -41,12 +42,9 @@ export default function BookPage({ params }: { params: { bookId: string } }) {
|
||||
fetchBookData();
|
||||
}, [params.bookId]);
|
||||
|
||||
const handleStartReading = () => {
|
||||
setIsReading(true);
|
||||
};
|
||||
|
||||
const handleCloseReader = () => {
|
||||
setIsReading(false);
|
||||
router.back();
|
||||
};
|
||||
|
||||
if (isLoading) {
|
||||
@@ -76,85 +74,76 @@ export default function BookPage({ params }: { params: { bookId: string } }) {
|
||||
|
||||
const { book, pages } = data;
|
||||
|
||||
if (isReading) {
|
||||
return <BookReader book={book} pages={pages} onClose={handleCloseReader} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="container py-8 space-y-8">
|
||||
{/* En-tête du tome */}
|
||||
<div className="flex flex-col md:flex-row gap-8">
|
||||
{/* Couverture */}
|
||||
<div className="w-48 shrink-0">
|
||||
<div className="relative aspect-[2/3] rounded-lg overflow-hidden bg-muted">
|
||||
{!imageError ? (
|
||||
<Image
|
||||
src={`/api/komga/images/books/${book.id}/thumbnail`}
|
||||
alt={`Couverture de ${book.metadata.title}`}
|
||||
fill
|
||||
className="object-cover"
|
||||
onError={() => setImageError(true)}
|
||||
/>
|
||||
) : (
|
||||
<div className="w-full h-full flex items-center justify-center">
|
||||
<ImageOff className="w-12 h-12" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="container py-8 space-y-8">
|
||||
{/* En-tête du tome */}
|
||||
<div className="flex flex-col md:flex-row gap-8">
|
||||
{/* Couverture */}
|
||||
<div className="w-48 shrink-0">
|
||||
<div className="relative aspect-[2/3] rounded-lg overflow-hidden bg-muted">
|
||||
{!imageError ? (
|
||||
<Image
|
||||
src={`/api/komga/images/books/${book.id}/thumbnail`}
|
||||
alt={`Couverture de ${book.metadata.title}`}
|
||||
fill
|
||||
className="object-cover"
|
||||
onError={() => setImageError(true)}
|
||||
/>
|
||||
) : (
|
||||
<div className="w-full h-full flex items-center justify-center">
|
||||
<ImageOff className="w-12 h-12" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Informations */}
|
||||
<div className="flex-1 space-y-4">
|
||||
<div>
|
||||
<h1 className="text-3xl font-bold">
|
||||
{book.metadata.title || `Tome ${book.metadata.number}`}
|
||||
</h1>
|
||||
<p className="text-muted-foreground">
|
||||
{book.seriesTitle} - Tome {book.metadata.number}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Informations */}
|
||||
<div className="flex-1 space-y-4">
|
||||
<div>
|
||||
<h1 className="text-3xl font-bold">
|
||||
{book.metadata.title || `Tome ${book.metadata.number}`}
|
||||
</h1>
|
||||
<p className="text-muted-foreground">
|
||||
{book.seriesTitle} - Tome {book.metadata.number}
|
||||
</p>
|
||||
</div>
|
||||
{book.metadata.summary && (
|
||||
<p className="text-muted-foreground">{book.metadata.summary}</p>
|
||||
)}
|
||||
|
||||
{book.metadata.summary && (
|
||||
<p className="text-muted-foreground">{book.metadata.summary}</p>
|
||||
<div className="space-y-1 text-sm text-muted-foreground">
|
||||
{book.metadata.releaseDate && (
|
||||
<div>
|
||||
<span className="font-medium">Date de sortie :</span>{" "}
|
||||
{new Date(book.metadata.releaseDate).toLocaleDateString()}
|
||||
</div>
|
||||
)}
|
||||
{book.metadata.authors?.length > 0 && (
|
||||
<div>
|
||||
<span className="font-medium">Auteurs :</span>{" "}
|
||||
{book.metadata.authors
|
||||
.map((author) => `${author.name} (${author.role})`)
|
||||
.join(", ")}
|
||||
</div>
|
||||
)}
|
||||
{book.size && (
|
||||
<div>
|
||||
<span className="font-medium">Taille :</span> {book.size}
|
||||
</div>
|
||||
)}
|
||||
{book.media.pagesCount > 0 && (
|
||||
<div>
|
||||
<span className="font-medium">Pages :</span> {book.media.pagesCount}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="space-y-1 text-sm text-muted-foreground">
|
||||
{book.metadata.releaseDate && (
|
||||
<div>
|
||||
<span className="font-medium">Date de sortie :</span>{" "}
|
||||
{new Date(book.metadata.releaseDate).toLocaleDateString()}
|
||||
</div>
|
||||
)}
|
||||
{book.metadata.authors?.length > 0 && (
|
||||
<div>
|
||||
<span className="font-medium">Auteurs :</span>{" "}
|
||||
{book.metadata.authors
|
||||
.map((author) => `${author.name} (${author.role})`)
|
||||
.join(", ")}
|
||||
</div>
|
||||
)}
|
||||
{book.size && (
|
||||
<div>
|
||||
<span className="font-medium">Taille :</span> {book.size}
|
||||
</div>
|
||||
)}
|
||||
{book.media.pagesCount > 0 && (
|
||||
<div>
|
||||
<span className="font-medium">Pages :</span> {book.media.pagesCount}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Bouton de lecture */}
|
||||
<button
|
||||
onClick={handleStartReading}
|
||||
className="inline-flex items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground ring-offset-background transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
|
||||
>
|
||||
Commencer la lecture
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Lecteur */}
|
||||
{isReading && <BookReader book={book} pages={pages} onClose={handleCloseReader} />}
|
||||
</>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -89,9 +89,18 @@ function MediaCard({ item, onClick }: MediaCardProps) {
|
||||
? item.metadata.title
|
||||
: item.metadata.title || `Tome ${item.metadata.number}`;
|
||||
|
||||
const handleClick = () => {
|
||||
console.log("MediaCard - handleClick:", {
|
||||
itemType: isSeries ? "series" : "book",
|
||||
itemId: item.id,
|
||||
itemTitle: title,
|
||||
});
|
||||
onClick?.();
|
||||
};
|
||||
|
||||
return (
|
||||
<button
|
||||
onClick={onClick}
|
||||
onClick={handleClick}
|
||||
className="flex-shrink-0 w-[200px] group relative flex flex-col rounded-lg border bg-card text-card-foreground shadow-sm hover:bg-accent hover:text-accent-foreground transition-colors overflow-hidden"
|
||||
>
|
||||
{/* Image de couverture */}
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
"use client";
|
||||
|
||||
import { KomgaBook } from "@/types/komga";
|
||||
import { ChevronLeft, ChevronRight, ImageOff, Loader2 } from "lucide-react";
|
||||
import {
|
||||
ChevronLeft,
|
||||
ChevronRight,
|
||||
ImageOff,
|
||||
Loader2,
|
||||
LayoutTemplate,
|
||||
SplitSquareVertical,
|
||||
} from "lucide-react";
|
||||
import Image from "next/image";
|
||||
import { useEffect, useState, useCallback } from "react";
|
||||
|
||||
@@ -15,22 +22,39 @@ export function BookReader({ book, pages, onClose }: BookReaderProps) {
|
||||
const [currentPage, setCurrentPage] = useState(1);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [imageError, setImageError] = useState(false);
|
||||
const [isDoublePage, setIsDoublePage] = useState(false);
|
||||
|
||||
// Fonction pour déterminer si on doit afficher une ou deux pages
|
||||
const shouldShowDoublePage = useCallback(
|
||||
(pageNumber: number) => {
|
||||
if (!isDoublePage) return false;
|
||||
// Toujours afficher la première page seule (couverture)
|
||||
if (pageNumber === 1) return false;
|
||||
// Vérifier si on a une page suivante disponible
|
||||
return pageNumber < pages.length;
|
||||
},
|
||||
[isDoublePage, pages.length]
|
||||
);
|
||||
|
||||
const handlePreviousPage = useCallback(() => {
|
||||
if (currentPage > 1) {
|
||||
setCurrentPage(currentPage - 1);
|
||||
// En mode double page, reculer de 2 pages sauf si on est sur la page 2
|
||||
const newPage = isDoublePage && currentPage > 2 ? currentPage - 2 : currentPage - 1;
|
||||
setCurrentPage(newPage);
|
||||
setIsLoading(true);
|
||||
setImageError(false);
|
||||
}
|
||||
}, [currentPage]);
|
||||
}, [currentPage, isDoublePage]);
|
||||
|
||||
const handleNextPage = useCallback(() => {
|
||||
if (currentPage < pages.length) {
|
||||
setCurrentPage(currentPage + 1);
|
||||
// En mode double page, avancer de 2 pages sauf si c'est la dernière paire
|
||||
const newPage = isDoublePage ? Math.min(currentPage + 2, pages.length) : currentPage + 1;
|
||||
setCurrentPage(newPage);
|
||||
setIsLoading(true);
|
||||
setImageError(false);
|
||||
}
|
||||
}, [currentPage, pages.length]);
|
||||
}, [currentPage, pages.length, isDoublePage]);
|
||||
|
||||
useEffect(() => {
|
||||
const handleKeyDown = (event: KeyboardEvent) => {
|
||||
@@ -50,41 +74,74 @@ export function BookReader({ book, pages, onClose }: BookReaderProps) {
|
||||
return (
|
||||
<div className="fixed inset-0 bg-background/95 backdrop-blur-sm z-50">
|
||||
<div className="relative h-full flex items-center justify-center">
|
||||
{/* Bouton mode double page */}
|
||||
<button
|
||||
onClick={() => setIsDoublePage(!isDoublePage)}
|
||||
className="absolute top-4 left-4 p-2 rounded-full bg-background/50 hover:bg-background/80 transition-colors"
|
||||
aria-label={
|
||||
isDoublePage ? "Désactiver le mode double page" : "Activer le mode double page"
|
||||
}
|
||||
>
|
||||
{isDoublePage ? (
|
||||
<LayoutTemplate className="h-6 w-6" />
|
||||
) : (
|
||||
<SplitSquareVertical className="h-6 w-6" />
|
||||
)}
|
||||
</button>
|
||||
|
||||
{/* Bouton précédent */}
|
||||
{currentPage > 1 && (
|
||||
<button
|
||||
onClick={handlePreviousPage}
|
||||
className="absolute left-4 p-2 rounded-full bg-background/50 hover:bg-background/80 transition-colors"
|
||||
className="absolute left-4 top-1/2 -translate-y-1/2 p-2 rounded-full bg-background/50 hover:bg-background/80 transition-colors"
|
||||
aria-label="Page précédente"
|
||||
>
|
||||
<ChevronLeft className="h-8 w-8" />
|
||||
</button>
|
||||
)}
|
||||
|
||||
{/* Page courante */}
|
||||
<div className="relative h-full max-h-full w-auto max-w-full p-4">
|
||||
{isLoading && (
|
||||
<div className="absolute inset-0 flex items-center justify-center">
|
||||
<Loader2 className="h-8 w-8 animate-spin" />
|
||||
</div>
|
||||
)}
|
||||
{!imageError ? (
|
||||
<Image
|
||||
src={`/api/komga/books/${book.id}/pages/${currentPage}`}
|
||||
alt={`Page ${currentPage}`}
|
||||
className="h-full w-auto object-contain"
|
||||
width={800}
|
||||
height={1200}
|
||||
priority
|
||||
onLoad={() => setIsLoading(false)}
|
||||
onError={() => {
|
||||
setIsLoading(false);
|
||||
setImageError(true);
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<div className="h-full w-96 flex items-center justify-center bg-muted rounded-lg">
|
||||
<ImageOff className="h-12 w-12" />
|
||||
{/* Pages */}
|
||||
<div className="relative h-full max-h-full w-auto max-w-full p-4 flex gap-2">
|
||||
{/* Page courante */}
|
||||
<div className="relative h-full w-auto">
|
||||
{isLoading && (
|
||||
<div className="absolute inset-0 flex items-center justify-center">
|
||||
<Loader2 className="h-8 w-8 animate-spin" />
|
||||
</div>
|
||||
)}
|
||||
{!imageError ? (
|
||||
<Image
|
||||
src={`/api/komga/books/${book.id}/pages/${currentPage}`}
|
||||
alt={`Page ${currentPage}`}
|
||||
className="h-full w-auto object-contain"
|
||||
width={800}
|
||||
height={1200}
|
||||
priority
|
||||
onLoad={() => setIsLoading(false)}
|
||||
onError={() => {
|
||||
setIsLoading(false);
|
||||
setImageError(true);
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<div className="h-full w-96 flex items-center justify-center bg-muted rounded-lg">
|
||||
<ImageOff className="h-12 w-12" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Deuxième page en mode double page */}
|
||||
{shouldShowDoublePage(currentPage) && (
|
||||
<div className="relative h-full w-auto">
|
||||
<Image
|
||||
src={`/api/komga/books/${book.id}/pages/${currentPage + 1}`}
|
||||
alt={`Page ${currentPage + 1}`}
|
||||
className="h-full w-auto object-contain"
|
||||
width={800}
|
||||
height={1200}
|
||||
priority
|
||||
onError={() => setImageError(true)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -93,7 +150,7 @@ export function BookReader({ book, pages, onClose }: BookReaderProps) {
|
||||
{currentPage < pages.length && (
|
||||
<button
|
||||
onClick={handleNextPage}
|
||||
className="absolute right-4 p-2 rounded-full bg-background/50 hover:bg-background/80 transition-colors"
|
||||
className="absolute right-4 top-1/2 -translate-y-1/2 p-2 rounded-full bg-background/50 hover:bg-background/80 transition-colors"
|
||||
aria-label="Page suivante"
|
||||
>
|
||||
<ChevronRight className="h-8 w-8" />
|
||||
@@ -102,7 +159,8 @@ export function BookReader({ book, pages, onClose }: BookReaderProps) {
|
||||
|
||||
{/* Indicateur de page */}
|
||||
<div className="absolute bottom-4 left-1/2 -translate-x-1/2 px-4 py-2 rounded-full bg-background/50 text-sm">
|
||||
Page {currentPage} / {pages.length}
|
||||
Page {currentPage}
|
||||
{shouldShowDoublePage(currentPage) ? `-${currentPage + 1}` : ""} / {pages.length}
|
||||
</div>
|
||||
|
||||
{/* Bouton fermer */}
|
||||
|
||||
@@ -7,7 +7,7 @@ import { useState } from "react";
|
||||
|
||||
interface BookGridProps {
|
||||
books: KomgaBook[];
|
||||
onBookClick?: (book: KomgaBook) => void;
|
||||
onBookClick: (book: KomgaBook) => void;
|
||||
getBookThumbnailUrl: (bookId: string) => string;
|
||||
}
|
||||
|
||||
@@ -21,14 +21,26 @@ export function BookGrid({ books, onBookClick, getBookThumbnailUrl }: BookGridPr
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="grid gap-4 sm:grid-cols-3 lg:grid-cols-6">
|
||||
<div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6">
|
||||
{books.map((book) => (
|
||||
<BookCard
|
||||
<button
|
||||
key={book.id}
|
||||
book={book}
|
||||
onClick={() => onBookClick?.(book)}
|
||||
getBookThumbnailUrl={getBookThumbnailUrl}
|
||||
/>
|
||||
onClick={() => onBookClick(book)}
|
||||
className="group relative aspect-[2/3] overflow-hidden rounded-lg bg-muted hover:opacity-80 transition-opacity"
|
||||
>
|
||||
<Image
|
||||
src={getBookThumbnailUrl(book.id)}
|
||||
alt={book.metadata.title}
|
||||
fill
|
||||
className="object-cover"
|
||||
sizes="(min-width: 1024px) 16.66vw, (min-width: 768px) 25vw, (min-width: 640px) 33.33vw, 50vw"
|
||||
/>
|
||||
<div className="absolute inset-x-0 bottom-0 bg-gradient-to-t from-black/60 to-transparent p-4">
|
||||
<p className="text-sm font-medium text-white text-left line-clamp-2">
|
||||
{book.metadata.title}
|
||||
</p>
|
||||
</div>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -15,7 +15,6 @@ interface PaginatedBookGridProps {
|
||||
totalPages: number;
|
||||
totalElements: number;
|
||||
pageSize: number;
|
||||
onBookClick?: (book: KomgaBook) => void;
|
||||
}
|
||||
|
||||
export function PaginatedBookGrid({
|
||||
@@ -25,7 +24,6 @@ export function PaginatedBookGrid({
|
||||
totalPages,
|
||||
totalElements,
|
||||
pageSize,
|
||||
onBookClick,
|
||||
}: PaginatedBookGridProps) {
|
||||
const router = useRouter();
|
||||
const pathname = usePathname();
|
||||
@@ -66,6 +64,14 @@ export function PaginatedBookGrid({
|
||||
router.push(`${pathname}?${params.toString()}`);
|
||||
};
|
||||
|
||||
const handleBookClick = (book: KomgaBook) => {
|
||||
console.log("PaginatedBookGrid - handleBookClick:", {
|
||||
bookId: book.id,
|
||||
bookTitle: book.metadata.title,
|
||||
});
|
||||
router.push(`/books/${book.id}`);
|
||||
};
|
||||
|
||||
// Calcul des indices de début et de fin pour l'affichage
|
||||
const startIndex = (currentPage - 1) * pageSize + 1;
|
||||
const endIndex = Math.min(currentPage * pageSize, totalElements);
|
||||
@@ -117,7 +123,7 @@ export function PaginatedBookGrid({
|
||||
>
|
||||
<BookGrid
|
||||
books={books}
|
||||
onBookClick={onBookClick}
|
||||
onBookClick={handleBookClick}
|
||||
getBookThumbnailUrl={getBookThumbnailUrl}
|
||||
/>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user