diff --git a/README.md b/README.md index 9e0465c..3740415 100644 --- a/README.md +++ b/README.md @@ -60,13 +60,14 @@ Dieser erste Commit liefert ein lauffähiges Grundgerüst: - ✅ Persistentes Docker-Volume für die SQLite-Datenbank - ✅ REST-API für Geräte & Dienste (`/api/devices`, `/api/services`), Zod-validiert, mit Repository-Layer über Drizzle (siehe `apps/backend/src/db/repositories`) +- ✅ Suche im Frontend gegen echte Backend-Daten (TanStack Query), inkl. Ranking-Logik + aus `packages/shared` und Tastatur-Navigation (Pfeiltasten, Enter, Escape) Noch **nicht** enthalten (folgt in den nächsten Commits): - Scanner (FritzBox, DNS, HTTP/HTTPS, Portscan, Softwareerkennung) -- Fuzzy-Suche im Frontend gegen echte Daten (Ranking-Logik existiert bereits in - `packages/shared`, ist aber noch nicht ans UI angebunden) -- Adminbereich, Plugin-System, PWA-Manifest, TanStack Router/Query, shadcn/ui, RHF +- Kategorien-Verwaltung & Favoriten-Toggle im UI +- Adminbereich, TanStack Router, Plugin-System, PWA-Manifest, shadcn/ui, RHF Siehe [`docs/ROADMAP.md`](./docs/ROADMAP.md) für die geplante Reihenfolge. diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 073fa78..380139b 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -12,6 +12,7 @@ "dependencies": { "@launchpad/shared": "workspace:*", "@launchpad/ui": "workspace:*", + "@tanstack/react-query": "^5.51.23", "react": "^18.3.1", "react-dom": "^18.3.1" }, diff --git a/apps/frontend/src/App.tsx b/apps/frontend/src/App.tsx index 83c799f..f671159 100644 --- a/apps/frontend/src/App.tsx +++ b/apps/frontend/src/App.tsx @@ -1,6 +1,7 @@ -import { useEffect, useRef, useState } from "react"; -import { SearchInput, StatusBadge } from "@launchpad/ui"; -import type { HealthStatus } from "@launchpad/shared"; +import { useEffect, useMemo, useRef, useState } from "react"; +import { SearchInput, StatusBadge, ResultsList } from "@launchpad/ui"; +import { rankServices, type Service, type HealthStatus } from "@launchpad/shared"; +import { useServices } from "./hooks/useServices.js"; type Theme = "light" | "dark"; @@ -55,33 +56,65 @@ function useBackendHealth() { return { health, error }; } +function openService(service: Service) { + window.open(service.url, "_blank", "noopener,noreferrer"); +} + export default function App() { const [theme, toggleTheme] = useTheme(); const [query, setQuery] = useState(""); - const { health, error } = useBackendHealth(); + const [selectedIndex, setSelectedIndex] = useState(0); + const { health, error: healthError } = useBackendHealth(); + const { data: services, isLoading, isError } = useServices(); const inputRef = useRef(null); + const results = useMemo( + () => rankServices(services ?? [], query), + [services, query] + ); + + // Auswahl zurücksetzen, sobald sich die Trefferliste ändert + useEffect(() => { + setSelectedIndex(0); + }, [results.length, query]); + useEffect(() => { function onKeyDown(e: KeyboardEvent) { const isSlash = e.key === "/" && document.activeElement !== inputRef.current; const isCmdK = (e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "k"; + if (isSlash || isCmdK) { e.preventDefault(); inputRef.current?.focus(); + return; } - if (e.key === "Escape") { + + if (document.activeElement !== inputRef.current) return; + + if (e.key === "ArrowDown") { + e.preventDefault(); + setSelectedIndex((i) => Math.min(i + 1, Math.max(results.length - 1, 0))); + } else if (e.key === "ArrowUp") { + e.preventDefault(); + setSelectedIndex((i) => Math.max(i - 1, 0)); + } else if (e.key === "Enter") { + e.preventDefault(); + const target = results[selectedIndex]; + if (target) openService(target); + } else if (e.key === "Escape") { inputRef.current?.blur(); setQuery(""); } } + window.addEventListener("keydown", onKeyDown); return () => window.removeEventListener("keydown", onKeyDown); - }, []); + }, [results, selectedIndex]); - const isOnline = !error && health?.status === "ok"; + const isOnline = !healthError && health?.status === "ok"; return ( -
+
-
+
{health ? ( diff --git a/apps/frontend/src/hooks/useServices.ts b/apps/frontend/src/hooks/useServices.ts new file mode 100644 index 0000000..7bc070d --- /dev/null +++ b/apps/frontend/src/hooks/useServices.ts @@ -0,0 +1,17 @@ +import { useQuery } from "@tanstack/react-query"; +import type { Service } from "@launchpad/shared"; + +async function fetchServices(): Promise { + const res = await fetch("/api/services"); + if (!res.ok) { + throw new Error(`Dienste konnten nicht geladen werden (HTTP ${res.status})`); + } + return res.json(); +} + +export function useServices() { + return useQuery({ + queryKey: ["services"], + queryFn: fetchServices, + }); +} diff --git a/apps/frontend/src/main.tsx b/apps/frontend/src/main.tsx index c241f00..7098093 100644 --- a/apps/frontend/src/main.tsx +++ b/apps/frontend/src/main.tsx @@ -1,10 +1,22 @@ import React from "react"; import ReactDOM from "react-dom/client"; +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import App from "./App.js"; import "./index.css"; +const queryClient = new QueryClient({ + defaultOptions: { + queries: { + staleTime: 30_000, + refetchOnWindowFocus: false, + }, + }, +}); + ReactDOM.createRoot(document.getElementById("root")!).render( - + + + ); diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index ceae795..1ef0ec0 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -9,11 +9,15 @@ Grundgerüst aus Commit 1. - Zod-Validierung der Request-Bodies (`packages/shared/src/schemas.ts`) - Repository-Layer über Drizzle (`apps/backend/src/db/repositories`) -## Commit 3 — Suche im Frontend +## ✅ Commit 3 — Suche im Frontend (erledigt) - Anbindung von `rankServices` aus `packages/shared` an echte Backend-Daten -- TanStack Query für Datenhaltung, TanStack Router für Adminbereich vs. Startseite -- Tastatur-Navigation (Pfeiltasten, Enter öffnet Dienst) +- TanStack Query für Datenhaltung (`apps/frontend/src/hooks/useServices.ts`) +- Tastatur-Navigation (Pfeiltasten wählen, Enter öffnet Dienst in neuem Tab, Escape leert Suche) +- Neue UI-Komponente `ResultsList` in `packages/ui` + +> TanStack Router wird bewusst erst mit dem Adminbereich (Commit 6) eingeführt, +> da es vorher keine zweite Route gibt, die er sinnvoll verwalten könnte. ## Commit 4 — Kategorien & Favoriten diff --git a/packages/ui/package.json b/packages/ui/package.json index a15ea02..a7f9e9c 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -10,6 +10,7 @@ "typecheck": "tsc -p tsconfig.json --noEmit" }, "dependencies": { + "@launchpad/shared": "workspace:*", "react": "^18.3.1" }, "devDependencies": { diff --git a/packages/ui/src/ResultsList.tsx b/packages/ui/src/ResultsList.tsx new file mode 100644 index 0000000..953f07f --- /dev/null +++ b/packages/ui/src/ResultsList.tsx @@ -0,0 +1,93 @@ +import type { Service } from "@launchpad/shared"; + +export interface ResultsListProps { + services: Service[]; + selectedIndex: number; + emptyLabel?: string; + onHover: (index: number) => void; + onOpen: (service: Service) => void; +} + +/** + * Zeigt die (bereits per rankServices sortierten) Suchtreffer an. + * Die Tastatur-Navigation (Pfeiltasten/Enter) wird vom Elternelement + * gesteuert; diese Komponente ist rein darstellend + klickbar. + */ +export function ResultsList({ + services, + selectedIndex, + emptyLabel = "Keine Dienste gefunden.", + onHover, + onOpen, +}: ResultsListProps) { + if (services.length === 0) { + return ( +
+ {emptyLabel} +
+ ); + } + + return ( +
    + {services.map((service, index) => { + const active = index === selectedIndex; + return ( +
  • + +
  • + ); + })} +
+ ); +} diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts index 45e94c3..d97f66f 100644 --- a/packages/ui/src/index.ts +++ b/packages/ui/src/index.ts @@ -3,3 +3,6 @@ export type { SearchInputProps } from "./SearchInput.js"; export { StatusBadge } from "./StatusBadge.js"; export type { StatusBadgeProps } from "./StatusBadge.js"; + +export { ResultsList } from "./ResultsList.js"; +export type { ResultsListProps } from "./ResultsList.js"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6dde8e5..b9a049a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,6 +57,9 @@ importers: '@launchpad/ui': specifier: workspace:* version: link:../../packages/ui + '@tanstack/react-query': + specifier: ^5.51.23 + version: 5.101.2(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -101,6 +104,9 @@ importers: packages/ui: dependencies: + '@launchpad/shared': + specifier: workspace:* + version: link:../shared react: specifier: ^18.3.1 version: 18.3.1 @@ -950,6 +956,14 @@ packages: cpu: [x64] os: [win32] + '@tanstack/query-core@5.101.2': + resolution: {integrity: sha512-hH5MLoJhF7KaIGd7q3xTXGXvslI+GYlM1Z/35aSHHWaCJWB7XvTSHYuV3eM7tw+aE0mT/xMro4M4Q9rCGHT0lw==} + + '@tanstack/react-query@5.101.2': + resolution: {integrity: sha512-seDkr6kzGzX1okaaTtZPtgA688CDPlXUz1C6xSg0ESqn04Vuc8tlrYms1s3de+znBqhPVxFRfpAfUf+6XvfPWg==} + peerDependencies: + react: ^18 || ^19 + '@types/babel__core@7.20.5': resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} @@ -2426,6 +2440,13 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.62.2': optional: true + '@tanstack/query-core@5.101.2': {} + + '@tanstack/react-query@5.101.2(react@18.3.1)': + dependencies: + '@tanstack/query-core': 5.101.2 + react: 18.3.1 + '@types/babel__core@7.20.5': dependencies: '@babel/parser': 7.29.7