feat(app): live server-side search with 300ms debounce and error state
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import type { Song, SongSummary, StoredSong } from "./types";
|
import type { Song, SongSummary, StoredSong, UpdateSongRequest } from "./types";
|
||||||
|
|
||||||
function getApiBase(): string {
|
function getApiBase(): string {
|
||||||
// Works in both SSR (Node/process.env) and client (import.meta.env)
|
// Works in both SSR (Node/process.env) and client (import.meta.env)
|
||||||
@@ -11,8 +11,11 @@ function getApiBase(): string {
|
|||||||
return "http://localhost:8000";
|
return "http://localhost:8000";
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function listSongs(): Promise<SongSummary[]> {
|
export async function listSongs(q = ""): Promise<SongSummary[]> {
|
||||||
const res = await fetch(`${getApiBase()}/songs`);
|
const url = q.trim()
|
||||||
|
? `${getApiBase()}/songs?q=${encodeURIComponent(q.trim())}`
|
||||||
|
: `${getApiBase()}/songs`;
|
||||||
|
const res = await fetch(url);
|
||||||
if (!res.ok) throw new Error(`Failed to load songs: ${res.status}`);
|
if (!res.ok) throw new Error(`Failed to load songs: ${res.status}`);
|
||||||
return res.json();
|
return res.json();
|
||||||
}
|
}
|
||||||
@@ -43,3 +46,16 @@ export async function createSong(body: {
|
|||||||
export async function deleteSong(id: string): Promise<void> {
|
export async function deleteSong(id: string): Promise<void> {
|
||||||
await fetch(`${getApiBase()}/songs/${id}`, { method: "DELETE" });
|
await fetch(`${getApiBase()}/songs/${id}`, { method: "DELETE" });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function updateSong(id: string, patch: UpdateSongRequest): Promise<SongSummary> {
|
||||||
|
const res = await fetch(`${getApiBase()}/songs/${id}`, {
|
||||||
|
method: "PATCH",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify(patch),
|
||||||
|
});
|
||||||
|
if (!res.ok) {
|
||||||
|
const data = await res.json().catch(() => ({}));
|
||||||
|
throw new Error((data as { error?: string }).error ?? `HTTP ${res.status}`);
|
||||||
|
}
|
||||||
|
return res.json();
|
||||||
|
}
|
||||||
|
|||||||
@@ -40,3 +40,9 @@ export interface StoredSong {
|
|||||||
id: string;
|
id: string;
|
||||||
song: Song;
|
song: Song;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface UpdateSongRequest {
|
||||||
|
title?: string;
|
||||||
|
artist?: string;
|
||||||
|
original_key?: string;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useState } from "react";
|
import { useCallback, useRef, useState } from "react";
|
||||||
|
import { useSearchParams, useRevalidator } from "react-router";
|
||||||
import type { Route } from "./+types/home";
|
import type { Route } from "./+types/home";
|
||||||
import { Button } from "~/components/ui/button";
|
import { Button } from "~/components/ui/button";
|
||||||
import { Input } from "~/components/ui/input";
|
import { Input } from "~/components/ui/input";
|
||||||
@@ -16,32 +17,38 @@ export function meta({}: Route.MetaArgs) {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function loader() {
|
export async function loader({ request }: Route.LoaderArgs) {
|
||||||
|
const q = new URL(request.url).searchParams.get("q") ?? "";
|
||||||
try {
|
try {
|
||||||
const songs = await listSongs();
|
const songs = await listSongs(q);
|
||||||
return { songs };
|
return { songs, q, error: false };
|
||||||
} catch {
|
} catch {
|
||||||
return { songs: [] };
|
return { songs: [], q, error: true };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function Home({ loaderData }: Route.ComponentProps) {
|
export default function Home({ loaderData }: Route.ComponentProps) {
|
||||||
const { songs } = loaderData;
|
const { songs, q: initialQ, error } = loaderData;
|
||||||
const [query, setQuery] = useState("");
|
const [searchParams, setSearchParams] = useSearchParams();
|
||||||
const [sheetOpen, setSheetOpen] = useState(false);
|
const [sheetOpen, setSheetOpen] = useState(false);
|
||||||
const [localSongs, setLocalSongs] = useState<SongSummary[]>([]);
|
const [localSongs, setLocalSongs] = useState<SongSummary[]>([]);
|
||||||
|
const revalidator = useRevalidator();
|
||||||
|
|
||||||
|
const [inputValue, setInputValue] = useState(initialQ);
|
||||||
|
const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||||
|
|
||||||
|
const handleSearch = useCallback((value: string) => {
|
||||||
|
setInputValue(value);
|
||||||
|
if (debounceRef.current) clearTimeout(debounceRef.current);
|
||||||
|
debounceRef.current = setTimeout(() => {
|
||||||
|
setSearchParams(value.trim() ? { q: value.trim() } : {}, { replace: true });
|
||||||
|
}, 300);
|
||||||
|
}, [setSearchParams]);
|
||||||
|
|
||||||
const allSongs = [...songs, ...localSongs];
|
const allSongs = [...songs, ...localSongs];
|
||||||
const filtered = query.trim()
|
|
||||||
? allSongs.filter(
|
|
||||||
(s) =>
|
|
||||||
s.meta.title.toLowerCase().includes(query.toLowerCase()) ||
|
|
||||||
s.meta.artist.toLowerCase().includes(query.toLowerCase())
|
|
||||||
)
|
|
||||||
: allSongs;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-dvh max-w-lg mx-auto">
|
<div className="flex flex-col h-full max-w-lg mx-auto">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div className="flex items-center justify-between px-4 pt-4 pb-2">
|
<div className="flex items-center justify-between px-4 pt-4 pb-2">
|
||||||
<h1 className="text-lg font-bold">PocketChords</h1>
|
<h1 className="text-lg font-bold">PocketChords</h1>
|
||||||
@@ -55,24 +62,39 @@ export default function Home({ loaderData }: Route.ComponentProps) {
|
|||||||
<div className="px-4 pb-3">
|
<div className="px-4 pb-3">
|
||||||
<Input
|
<Input
|
||||||
placeholder="Search songs..."
|
placeholder="Search songs..."
|
||||||
value={query}
|
value={inputValue}
|
||||||
onChange={(e) => setQuery(e.target.value)}
|
onChange={(e) => handleSearch(e.target.value)}
|
||||||
className="w-full"
|
className="w-full"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Error state */}
|
||||||
|
{error && (
|
||||||
|
<div className="flex flex-col items-center gap-3 pt-8 pb-4 px-6 text-center">
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
Couldn't load your songs. Is the API running?
|
||||||
|
</p>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => revalidator.revalidate()}
|
||||||
|
>
|
||||||
|
Retry
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Grid */}
|
{/* Grid */}
|
||||||
<div className="flex-1 overflow-y-auto px-4 pb-4">
|
<div className="flex-1 overflow-y-auto px-4 pb-4">
|
||||||
{filtered.length === 0 && (
|
{!error && allSongs.length === 0 && (
|
||||||
<p className="text-sm text-muted-foreground text-center pt-8 pb-4">
|
<p className="text-sm text-muted-foreground text-center pt-8 pb-4">
|
||||||
{query ? "No songs match your search." : "No songs yet. Tap Add to get started."}
|
{initialQ ? "No songs match your search." : "No songs yet. Tap Add to get started."}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
{filtered.map((song) => (
|
{allSongs.map((song) => (
|
||||||
<SongCard key={song.id} song={song} />
|
<SongCard key={song.id} song={song} />
|
||||||
))}
|
))}
|
||||||
{/* Add card */}
|
|
||||||
<Card
|
<Card
|
||||||
className="h-full border-dashed cursor-pointer hover:bg-accent transition-colors"
|
className="h-full border-dashed cursor-pointer hover:bg-accent transition-colors"
|
||||||
onClick={() => setSheetOpen(true)}
|
onClick={() => setSheetOpen(true)}
|
||||||
|
|||||||
Reference in New Issue
Block a user