feat: loading on page change
This commit is contained in:
@@ -4,25 +4,28 @@ import { HeroSection } from "./HeroSection";
|
||||
import { MediaRow } from "./MediaRow";
|
||||
import { KomgaBook, KomgaSeries } from "@/types/komga";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useNetworkRequest } from "@/lib/hooks/use-network-request";
|
||||
|
||||
interface HomeData {
|
||||
ongoing: KomgaSeries[];
|
||||
recentlyRead: KomgaBook[];
|
||||
onDeck: KomgaBook[];
|
||||
}
|
||||
|
||||
interface HomeContentProps {
|
||||
data: {
|
||||
ongoing: KomgaSeries[];
|
||||
recentlyRead: KomgaBook[];
|
||||
onDeck: KomgaBook[];
|
||||
};
|
||||
data: HomeData;
|
||||
}
|
||||
|
||||
export function HomeContent({ data }: HomeContentProps) {
|
||||
const router = useRouter();
|
||||
const handleItemClick = (item: KomgaSeries | KomgaBook) => {
|
||||
// Si c'est une série (a la propriété booksCount), on va vers la page de la série
|
||||
if ("booksCount" in item) {
|
||||
router.push(`/series/${item.id}`);
|
||||
} else {
|
||||
// Si c'est un livre, on va directement vers la page de lecture
|
||||
router.push(`/books/${item.id}`);
|
||||
}
|
||||
const { executeRequest } = useNetworkRequest();
|
||||
|
||||
const handleItemClick = async (item: KomgaSeries | KomgaBook) => {
|
||||
const path = "booksCount" in item ? `/series/${item.id}` : `/books/${item.id}`;
|
||||
|
||||
await executeRequest(async () => {
|
||||
router.push(path);
|
||||
});
|
||||
};
|
||||
|
||||
// Vérification des données pour le debug
|
||||
|
||||
@@ -7,6 +7,7 @@ import { cn } from "@/lib/utils";
|
||||
import { authService } from "@/lib/services/auth.service";
|
||||
import { useEffect, useState, useCallback } from "react";
|
||||
import { KomgaLibrary, KomgaSeries } from "@/types/komga";
|
||||
import { useNetworkRequest } from "@/lib/hooks/use-network-request";
|
||||
|
||||
interface SidebarProps {
|
||||
isOpen: boolean;
|
||||
@@ -16,6 +17,7 @@ interface SidebarProps {
|
||||
export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||
const pathname = usePathname();
|
||||
const router = useRouter();
|
||||
const { executeRequest } = useNetworkRequest();
|
||||
const [libraries, setLibraries] = useState<KomgaLibrary[]>([]);
|
||||
const [favorites, setFavorites] = useState<KomgaSeries[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
@@ -104,8 +106,11 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||
router.push("/login");
|
||||
};
|
||||
|
||||
const handleLinkClick = () => {
|
||||
const handleLinkClick = async (path: string) => {
|
||||
onClose();
|
||||
await executeRequest(async () => {
|
||||
router.push(path);
|
||||
});
|
||||
};
|
||||
|
||||
const navigation = [
|
||||
@@ -131,18 +136,17 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||
<div className="space-y-1">
|
||||
<h2 className="mb-2 px-4 text-lg font-semibold tracking-tight">Navigation</h2>
|
||||
{navigation.map((item) => (
|
||||
<Link
|
||||
<button
|
||||
key={item.href}
|
||||
href={item.href}
|
||||
onClick={handleLinkClick}
|
||||
onClick={() => handleLinkClick(item.href)}
|
||||
className={cn(
|
||||
"flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
"w-full flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
pathname === item.href ? "bg-accent" : "transparent"
|
||||
)}
|
||||
>
|
||||
<item.icon className="mr-2 h-4 w-4" />
|
||||
{item.name}
|
||||
</Link>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
@@ -159,18 +163,17 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||
<div className="px-3 py-2 text-sm text-muted-foreground">Aucun favori</div>
|
||||
) : (
|
||||
favorites.map((series) => (
|
||||
<Link
|
||||
<button
|
||||
key={series.id}
|
||||
href={`/series/${series.id}`}
|
||||
onClick={handleLinkClick}
|
||||
onClick={() => handleLinkClick(`/series/${series.id}`)}
|
||||
className={cn(
|
||||
"flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
"w-full flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
pathname === `/series/${series.id}` ? "bg-accent" : "transparent"
|
||||
)}
|
||||
>
|
||||
<Star className="mr-2 h-4 w-4 fill-yellow-400 text-yellow-400" />
|
||||
<span className="truncate">{series.metadata.title}</span>
|
||||
</Link>
|
||||
</button>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
@@ -195,18 +198,17 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||
<div className="px-3 py-2 text-sm text-muted-foreground">Aucune bibliothèque</div>
|
||||
) : (
|
||||
libraries.map((library) => (
|
||||
<Link
|
||||
<button
|
||||
key={library.id}
|
||||
href={`/libraries/${library.id}`}
|
||||
onClick={handleLinkClick}
|
||||
onClick={() => handleLinkClick(`/libraries/${library.id}`)}
|
||||
className={cn(
|
||||
"flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
"w-full flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
pathname === `/libraries/${library.id}` ? "bg-accent" : "transparent"
|
||||
)}
|
||||
>
|
||||
<Library className="mr-2 h-4 w-4" />
|
||||
{library.name}
|
||||
</Link>
|
||||
</button>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
@@ -215,17 +217,16 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||
<div className="px-3 py-2">
|
||||
<div className="space-y-1">
|
||||
<h2 className="mb-2 px-4 text-lg font-semibold tracking-tight">Configuration</h2>
|
||||
<Link
|
||||
href="/settings"
|
||||
onClick={handleLinkClick}
|
||||
<button
|
||||
onClick={() => handleLinkClick("/settings")}
|
||||
className={cn(
|
||||
"flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
"w-full flex items-center rounded-lg px-3 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground",
|
||||
pathname === "/settings" ? "bg-accent" : "transparent"
|
||||
)}
|
||||
>
|
||||
<Settings className="mr-2 h-4 w-4" />
|
||||
Préférences
|
||||
</Link>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
88
src/components/ui/network-progress.tsx
Normal file
88
src/components/ui/network-progress.tsx
Normal file
@@ -0,0 +1,88 @@
|
||||
"use client";
|
||||
|
||||
import { createContext, useContext, useState, useCallback } from "react";
|
||||
import { Loader2 } from "lucide-react";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
interface NetworkProgressContextType {
|
||||
startProgress: (requestId: string) => void;
|
||||
updateProgress: (requestId: string, progress: number) => void;
|
||||
completeProgress: (requestId: string) => void;
|
||||
}
|
||||
|
||||
const NetworkProgressContext = createContext<NetworkProgressContextType | null>(null);
|
||||
|
||||
export function NetworkProgressProvider({ children }: { children: React.ReactNode }) {
|
||||
const [activeRequests, setActiveRequests] = useState<Record<string, number>>({});
|
||||
|
||||
const startProgress = useCallback((requestId: string) => {
|
||||
setActiveRequests((prev) => ({ ...prev, [requestId]: 0 }));
|
||||
}, []);
|
||||
|
||||
const updateProgress = useCallback((requestId: string, progress: number) => {
|
||||
setActiveRequests((prev) => ({ ...prev, [requestId]: progress }));
|
||||
}, []);
|
||||
|
||||
const completeProgress = useCallback((requestId: string) => {
|
||||
setActiveRequests((prev) => {
|
||||
const newRequests = { ...prev };
|
||||
delete newRequests[requestId];
|
||||
return newRequests;
|
||||
});
|
||||
}, []);
|
||||
|
||||
const totalProgress = Object.values(activeRequests).reduce((acc, curr) => acc + curr, 0);
|
||||
const requestCount = Object.keys(activeRequests).length;
|
||||
const averageProgress = requestCount > 0 ? totalProgress / requestCount : 0;
|
||||
|
||||
return (
|
||||
<NetworkProgressContext.Provider value={{ startProgress, updateProgress, completeProgress }}>
|
||||
{children}
|
||||
{requestCount > 0 && (
|
||||
<>
|
||||
{/* Barre de progression en haut */}
|
||||
<div className="fixed top-0 left-0 right-0 z-50">
|
||||
<div className="h-1 w-full bg-muted">
|
||||
<div
|
||||
className="h-full bg-primary transition-all duration-300 ease-out"
|
||||
style={{ width: `${averageProgress}%` }}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Indicateur de progression au centre */}
|
||||
<div className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50">
|
||||
<div className="bg-background/80 backdrop-blur-sm rounded-lg p-4 flex items-center gap-2">
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
<span className="text-sm font-medium">{Math.round(averageProgress)}%</span>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</NetworkProgressContext.Provider>
|
||||
);
|
||||
}
|
||||
|
||||
export function useNetworkProgress() {
|
||||
const context = useContext(NetworkProgressContext);
|
||||
if (!context) {
|
||||
throw new Error("useNetworkProgress must be used within a NetworkProgressProvider");
|
||||
}
|
||||
return context;
|
||||
}
|
||||
|
||||
// Fonction utilitaire pour simuler une progression
|
||||
export async function simulateProgress(
|
||||
requestId: string,
|
||||
updateFn: (requestId: string, progress: number) => void,
|
||||
duration: number = 1000
|
||||
) {
|
||||
const steps = 20;
|
||||
const increment = 100 / steps;
|
||||
const stepDuration = duration / steps;
|
||||
|
||||
for (let i = 1; i <= steps; i++) {
|
||||
await new Promise((resolve) => setTimeout(resolve, stepDuration));
|
||||
updateFn(requestId, Math.min(increment * i, 99));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user