Compare commits
8
Commits
298da72b6d
..
v0.6.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e63fec49b | ||
|
|
3ce866da2c | ||
|
|
5b40d5e4ff | ||
|
|
c50fa811c5 | ||
|
|
e40a3bd62e | ||
|
|
79c4bd1967 | ||
|
|
0212dad2bf | ||
|
|
72bcf824ce |
@@ -46,6 +46,12 @@ yarn-error.log*
|
||||
# Sicherungen aus scripts/backup.* – enthalten alle Daten der Instanz
|
||||
/backups
|
||||
|
||||
# Playwright
|
||||
/test-results
|
||||
/playwright-report
|
||||
/blob-report
|
||||
/playwright/.cache
|
||||
|
||||
# editors
|
||||
.idea/
|
||||
.vscode/*
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
# Nebula – Hinweise für Claude Code
|
||||
|
||||
Dashboard für Vibe-Coding-Projekte. Next.js 15 (App Router), TypeScript,
|
||||
Tailwind 4, Prisma, PostgreSQL. Oberfläche und Texte sind **deutsch**.
|
||||
|
||||
Funktionsumfang: [FEATURES.md](FEATURES.md) · Geplantes: [ROADMAP.md](ROADMAP.md) ·
|
||||
Betrieb: [README.md](README.md)
|
||||
|
||||
## Womit man arbeitet
|
||||
|
||||
```bash
|
||||
docker compose up -d db # Postgres, muss laufen
|
||||
npm run dev # Entwicklung
|
||||
npm test # Unit-Tests (Vitest, ohne DB)
|
||||
npx tsc --noEmit # Typprüfung
|
||||
npm run build # Produktionsbau
|
||||
docker compose --profile full up -d --build # alles im Container
|
||||
```
|
||||
|
||||
**Vor dem `npm run build` einen laufenden `npm start`/`npm run dev` beenden.**
|
||||
Sonst hält der Prozess die Prisma-Engine-DLL und der Bau bricht unter Windows
|
||||
mit `EPERM … query_engine-windows.dll.node` ab.
|
||||
|
||||
## Nicht verhandelbar
|
||||
|
||||
**Datentrennung.** Jede Abfrage filtert auf den Besitzer, und zwar an erster
|
||||
Stelle in der `where`-Klausel. Schreiben und Löschen laufen über
|
||||
`updateMany`/`deleteMany` mit `ownerId`, damit fremde Datensätze gar nicht
|
||||
erst getroffen werden. Fremde IDs liefern **404, nicht 403** — die Antwort
|
||||
soll nicht bestätigen, dass es den Datensatz gibt.
|
||||
|
||||
**Jeder Endpunkt prüft selbst.** `requireUserApi()` bzw. `requireUserPage()`
|
||||
sind die Sicherheitsgrenze. Die Middleware schaut nur, ob überhaupt ein
|
||||
Cookie mitkommt — im Edge-Runtime gibt es keine Datenbank.
|
||||
|
||||
**Eingaben validieren.** Zod an jeder API-Grenze, Body über `readJsonBody`
|
||||
(erzwingt `application/json` und begrenzt die Größe).
|
||||
|
||||
**Keine Geheimnisse nach außen.** Git-Tokens verlassen den Server nie;
|
||||
Verbindungen werden über `connectionSafeSelect` geladen. Projekt-Exporte
|
||||
enthalten grundsätzlich keine Tokens.
|
||||
|
||||
**Ausgehende Aufrufe nur über `lib/git/http.ts`** — dort greift der
|
||||
SSRF-Schutz (`lib/security/ssrf.ts`).
|
||||
|
||||
## Fallstricke, die schon zugeschlagen haben
|
||||
|
||||
- **`node:`-Module in Client-Komponenten.** `lib/crypto`, `lib/auth/password`,
|
||||
`lib/git/index` ziehen `node:crypto`/`node:net` nach. Client-Komponenten
|
||||
importieren stattdessen `lib/git/meta` bzw. `lib/auth/constants`.
|
||||
- **`instrumentation.ts` wird auch für Edge übersetzt.** Der dynamische Import
|
||||
muss *innerhalb* von `if (process.env.NEXT_RUNTIME === "nodejs")` stehen,
|
||||
sonst scheitert der Bau an `node:crypto`.
|
||||
- **Eigene CSS-Klassen gehören in `app/components.css`** und dort in
|
||||
`@layer components`. Außerhalb eines Layers gewinnen sie gegen
|
||||
Tailwind-Utilities — dann greift `pl-9` neben `.field` nicht mehr.
|
||||
- **Menüs und Dialoge über Portal.** Karten setzen `overflow-hidden` und
|
||||
`backdrop-filter`; Letzteres erzeugt einen neuen Bezugsrahmen, in dem
|
||||
`position: fixed` und `z-index` nicht mehr wie erwartet wirken. Dafür gibt
|
||||
es `components/ui/Popover.tsx` und `components/ui/Modal.tsx`.
|
||||
- **Overlays brauchen einen deckenden Hintergrund** (`.popover`), nicht
|
||||
`.glass` — dessen 3,5 % Deckkraft lassen alles durchscheinen.
|
||||
- **Datumsangaben** über `lib/utils` formatieren (feste Zeitzone), sonst
|
||||
weichen Server-Render und Hydration voneinander ab. Relative Zeiten
|
||||
bekommen `suppressHydrationWarning`.
|
||||
|
||||
## Migrationen
|
||||
|
||||
`prisma migrate dev` ist hier nicht benutzbar (interaktiv). Stattdessen:
|
||||
|
||||
```bash
|
||||
npx prisma migrate diff --from-schema-datasource prisma/schema.prisma \
|
||||
--to-schema-datamodel prisma/schema.prisma --script --output prisma/migrations/<stempel>_<name>/migration.sql
|
||||
npx prisma migrate deploy
|
||||
```
|
||||
|
||||
**Die erzeugte SQL vor dem Anwenden lesen.** Der Volltextindex
|
||||
`Note_fulltext_idx` ist ein Ausdrucksindex, den Prisma nicht kennt (er wird
|
||||
bislang in Ruhe gelassen, aber das ist nicht garantiert).
|
||||
|
||||
## Prüfen, nicht behaupten
|
||||
|
||||
Vor „fertig": `npx tsc --noEmit`, `npm test`, `npm run build`.
|
||||
|
||||
Bei Änderungen an der Oberfläche **hinsehen**. Chrome ist installiert, ein
|
||||
Skript mit `playwright-core` und `channel: "chrome"` genügt für Screenshots.
|
||||
Mehrere Anzeigefehler dieses Projekts sind ausschließlich so aufgefallen.
|
||||
|
||||
**Niemals gegen die echte Datenbank testen.** Eine Wegwerf-Datenbank anlegen
|
||||
und danach löschen:
|
||||
|
||||
```bash
|
||||
docker exec nebula-db psql -U nebula -d postgres -c "CREATE DATABASE nebula_test"
|
||||
DATABASE_URL=postgresql://nebula:nebula@localhost:5432/nebula_test npx prisma migrate deploy
|
||||
```
|
||||
|
||||
## Sprache
|
||||
|
||||
Code-Kommentare, Commit-Nachrichten und Oberfläche auf Deutsch, **ohne
|
||||
Umlaute in Bezeichnern und Commit-Nachrichten** (bestehende Konvention).
|
||||
In Markdown-Dateien und in der Oberfläche sind Umlaute erwünscht.
|
||||
|
||||
Commits: Conventional Commits, Betreff deutsch, Rumpf erklärt **warum** —
|
||||
nicht was der Diff ohnehin zeigt.
|
||||
+34
@@ -137,6 +137,39 @@ Anzahl Notizen · Warnung bei Sync-Fehler · Tags · Statusauswahl · Priorität
|
||||
|
||||
---
|
||||
|
||||
## 2a. Aufgaben je Projekt
|
||||
|
||||
Jedes Projekt hat ein eigenes Aufgabenbrett mit vier Spalten: **Offen · In Arbeit ·
|
||||
Blockiert · Erledigt**.
|
||||
|
||||
- **Ziehen und Ablegen** zwischen den Spalten **und innerhalb** einer Spalte. Anders als
|
||||
beim Projektbrett ist die Reihenfolge hier bedeutsam, deshalb wird sie gespeichert.
|
||||
- Gezogen wird am Griff links, damit ein Klick auf die Karte weiter den Dialog öffnet.
|
||||
- Eine Aufgabe braucht nur einen Titel. Optional: Beschreibung (Markdown),
|
||||
Fälligkeitsdatum und Labels.
|
||||
- **Fälligkeiten** färben sich mit: überfällig rot, heute gelb, in den nächsten Tagen
|
||||
gedämpft.
|
||||
- Erledigtes wird durchgestrichen; der Zeitpunkt wird festgehalten und beim Zurückziehen
|
||||
wieder gelöscht.
|
||||
|
||||
### Fortschritt aus Aufgaben
|
||||
|
||||
Pro Projekt umschaltbar. Ist es an, ergibt sich der Fortschritt aus dem Anteil erledigter
|
||||
Aufgaben und wird bei jeder Änderung neu berechnet — der Regler ist dann gesperrt, statt
|
||||
einen Wert anzubieten, der gleich wieder überschrieben würde.
|
||||
|
||||
Auf der Projektkarte im Dashboard steht das Verhältnis als `3/8`.
|
||||
|
||||
### Wie die Reihenfolge gespeichert wird
|
||||
|
||||
Beim Ablegen schickt die Oberfläche je Spalte die **vollständige Liste** der Aufgaben in
|
||||
ihrer neuen Reihenfolge; der Server vergibt daraus Position und Status. Das ist
|
||||
wiederholbar, kommt ohne Positionsrechnerei im Browser aus, und ein verlorener Aufruf
|
||||
lässt sich einfach erneut senden. IDs, die nicht zum Projekt gehören, werden ignoriert
|
||||
statt verschoben.
|
||||
|
||||
---
|
||||
|
||||
## 3. Notizen
|
||||
|
||||
- **Beliebig viele Notizen pro Projekt**, mit optionalem Titel und mehrzeiligem Text.
|
||||
@@ -315,6 +348,7 @@ Dateneinsicht. Ein Administrator sieht dadurch weiterhin keine fremden Projekte.
|
||||
| `WebAuthnChallenge` | Kurzlebige, einmalig verwendbare Challenges |
|
||||
| `AppSettings` | Betriebsart und Registrierung (eine Zeile) |
|
||||
| `Project` | Projektstammdaten, Status, Fortschritt, Repo-Verknüpfung, Besitzer |
|
||||
| `Task` | Aufgaben mit Spalte, Position, Fälligkeit und Labels |
|
||||
| `Note` | Notizen (n:1 zu Projekt, Cascade-Delete) |
|
||||
| `GitConnection` | Git-Systeme inkl. verschlüsseltem Token, Besitzer |
|
||||
| `RepoSnapshot` | Zwischengespeicherter Repo-Stand (1:1 zu Projekt) |
|
||||
|
||||
@@ -337,6 +337,9 @@ ausschließlich Daten des angemeldeten Kontos.
|
||||
| `GET` | `/api/search?q=` | Volltextsuche über die eigenen Notizen |
|
||||
| `GET` `PATCH` `DELETE` | `/api/projects/:id` | Projekt lesen / ändern / löschen |
|
||||
| `POST` | `/api/projects/:id/sync` | Repo-Daten vom Git-System holen |
|
||||
| `GET` `POST` | `/api/projects/:id/tasks` | Aufgaben des Projekts |
|
||||
| `PATCH` | `/api/projects/:id/tasks/reorder` | Neue Reihenfolge nach dem Ziehen |
|
||||
| `PATCH` `DELETE` | `/api/tasks/:id` | Aufgabe ändern / löschen |
|
||||
| `GET` `POST` | `/api/projects/:id/notes` | Notizen des Projekts |
|
||||
| `PATCH` `DELETE` | `/api/notes/:id` | Notiz ändern / löschen |
|
||||
| `GET` `POST` | `/api/connections` | Git-Verbindungen |
|
||||
|
||||
+3
-6
@@ -31,12 +31,6 @@ stillstehen. Kanäle: E-Mail (SMTP), ntfy, generischer Webhook. Zusammen mit
|
||||
dem automatischen Abgleich und dem CI-Status ergibt das ein brauchbares
|
||||
Frühwarnsystem — die Daten liegen bereits vor.
|
||||
|
||||
### 1.3 Aufgaben und Checklisten `M`
|
||||
|
||||
Eigene Entität statt Freitext, mit Häkchen und automatisch berechnetem
|
||||
Fortschritt. Ersetzt das manuelle Schieben des Reglers. Die Markdown-
|
||||
Checklisten in Notizen sind ein Vorgeschmack, aber nicht auswertbar.
|
||||
|
||||
---
|
||||
|
||||
## 2 · Danach
|
||||
@@ -93,6 +87,8 @@ Voraussetzung, falls du das Projekt veröffentlichen willst.
|
||||
| Suchtreffer in Notizen hervorheben | `S` | In der Notiz selbst, nicht nur in der Trefferliste |
|
||||
| Mehrfachauswahl im Board | `S` | Status oder Tags für mehrere auf einmal |
|
||||
| Aktivitätsverlauf je Projekt | `S` | Wer hat wann was geändert |
|
||||
| Wiederkehrende Aufgaben | `M` | Etwa „jeden Montag Abhängigkeiten prüfen" |
|
||||
| Aufgaben aus Git-Issues übernehmen | `M` | Offene Issues als Aufgaben einhängen |
|
||||
| Projektvorlagen | `S` | Neues Projekt mit vorgefüllten Tags und Notizen |
|
||||
| Hell/Dunkel umschaltbar | `M` | Aktuell nur dunkel |
|
||||
| Eigenes Logo und Farbe | `S` | Ergänzt `APP_NAME` |
|
||||
@@ -132,6 +128,7 @@ Damit klar ist, was **nicht** kommt und warum:
|
||||
| Export, Import und Sicherung | ✓ |
|
||||
| **v0.3.0** Markdown, Volltextsuche über Notizen, PR- und Issue-Listen, Testfundament | ✓ |
|
||||
| **v0.4.0** Kanban mit Drag & Drop, CI-Status je Branch, Commit-Aktivität | ✓ |
|
||||
| **v0.5.0** Aufgabenbrett je Projekt mit sortierbaren Spalten, Fortschritt aus Aufgaben | ✓ |
|
||||
|
||||
Zur Entscheidung beim Export: Git-Tokens gehen **nicht** mit. Die Verbindung wird nur
|
||||
beschrieben, das Token ist nach dem Import neu zu hinterlegen. Snapshots bleiben
|
||||
|
||||
+227
@@ -0,0 +1,227 @@
|
||||
import { expect, test, type APIRequestContext } from "@playwright/test";
|
||||
|
||||
/**
|
||||
* Tests ueber HTTP gegen die laufende Anwendung – also durch Middleware,
|
||||
* Authentifizierung, Validierung und Datenbank hindurch. Genau die Dinge,
|
||||
* die Unit-Tests nicht erreichen.
|
||||
*
|
||||
* Die Tests bauen aufeinander auf und laufen in dieser Reihenfolge, weil sie
|
||||
* sich eine Datenbank teilen (siehe playwright.config.ts, workers: 1).
|
||||
*/
|
||||
|
||||
const ADMIN = { username: "chefin", password: "ein-langes-testpasswort" };
|
||||
const ZWEITER = { username: "zweiter", password: "noch-ein-langes-passwort" };
|
||||
|
||||
async function login(request: APIRequestContext, user: { username: string; password: string }) {
|
||||
const response = await request.post("/api/auth/login", { data: user });
|
||||
expect(response.ok(), `Anmeldung als ${user.username}`).toBeTruthy();
|
||||
}
|
||||
|
||||
test.describe.configure({ mode: "serial" });
|
||||
|
||||
test("Einrichtung legt das erste Konto an und sperrt sich danach", async ({ request }) => {
|
||||
const response = await request.post("/api/auth/setup", {
|
||||
data: { ...ADMIN, mode: "MULTI_USER" },
|
||||
});
|
||||
expect(response.status()).toBe(200);
|
||||
expect((await response.json()).user.role).toBe("ADMIN");
|
||||
|
||||
// Ein zweiter Aufruf darf kein weiteres Adminkonto erzeugen.
|
||||
const wieder = await request.post("/api/auth/setup", {
|
||||
data: { username: "eindringling", password: "ein-langes-testpasswort" },
|
||||
});
|
||||
expect(wieder.status()).toBe(409);
|
||||
});
|
||||
|
||||
test("ohne Anmeldung ist nichts zu holen", async ({ playwright }) => {
|
||||
const anonym = await playwright.request.newContext({ baseURL: test.info().project.use.baseURL });
|
||||
for (const pfad of ["/api/projects", "/api/connections", "/api/admin/users"]) {
|
||||
expect((await anonym.get(pfad)).status(), pfad).toBe(401);
|
||||
}
|
||||
await anonym.dispose();
|
||||
});
|
||||
|
||||
test("Fremdes Origin wird abgewiesen", async ({ request }) => {
|
||||
await login(request, ADMIN);
|
||||
const response = await request.post("/api/projects", {
|
||||
data: { name: "Von woanders" },
|
||||
headers: { Origin: "https://boese.example" },
|
||||
});
|
||||
expect(response.status()).toBe(403);
|
||||
});
|
||||
|
||||
test("Content-Type wird erzwungen", async ({ request }) => {
|
||||
await login(request, ADMIN);
|
||||
const response = await request.post("/api/projects", {
|
||||
headers: { "Content-Type": "text/plain" },
|
||||
data: JSON.stringify({ name: "Umgehung" }),
|
||||
});
|
||||
expect(response.status()).toBe(415);
|
||||
});
|
||||
|
||||
test("SSRF: interne Adressen werden geblockt", async ({ request }) => {
|
||||
await login(request, ADMIN);
|
||||
for (const ziel of ["http://127.0.0.1:5432", "http://169.254.169.254", "http://0.0.0.0"]) {
|
||||
const response = await request.post("/api/connections", {
|
||||
data: { name: `ssrf-${ziel}`, provider: "GITEA", baseUrl: ziel },
|
||||
});
|
||||
expect(response.status(), ziel).toBe(422);
|
||||
}
|
||||
});
|
||||
|
||||
test("Datentrennung zwischen zwei Konten", async ({ request, playwright }) => {
|
||||
await login(request, ADMIN);
|
||||
|
||||
const angelegt = await request.post("/api/projects", {
|
||||
data: { name: "Geheimprojekt", status: "IN_DEVELOPMENT" },
|
||||
});
|
||||
expect(angelegt.status()).toBe(201);
|
||||
const projektId = (await angelegt.json()).project.id;
|
||||
|
||||
const aufgabe = await request.post(`/api/projects/${projektId}/tasks`, {
|
||||
data: { title: "Nicht fuer fremde Augen" },
|
||||
});
|
||||
expect(aufgabe.status()).toBe(201);
|
||||
const aufgabenId = (await aufgabe.json()).task.id;
|
||||
|
||||
// Zweites Konto anlegen und in einem eigenen Kontext anmelden.
|
||||
const neu = await request.post("/api/admin/users", {
|
||||
data: { ...ZWEITER, role: "USER" },
|
||||
});
|
||||
expect(neu.status()).toBe(201);
|
||||
|
||||
const fremd = await playwright.request.newContext({
|
||||
baseURL: test.info().project.use.baseURL,
|
||||
});
|
||||
await login(fremd, ZWEITER);
|
||||
|
||||
expect((await (await fremd.get("/api/projects")).json()).projects).toHaveLength(0);
|
||||
|
||||
// Fremde IDs muessen 404 liefern, nicht 403 – sonst waere die Existenz
|
||||
// des Datensatzes bestaetigt.
|
||||
expect((await fremd.get(`/api/projects/${projektId}`)).status()).toBe(404);
|
||||
expect(
|
||||
(await fremd.patch(`/api/projects/${projektId}`, { data: { name: "uebernommen" } })).status(),
|
||||
).toBe(404);
|
||||
expect((await fremd.delete(`/api/projects/${projektId}`)).status()).toBe(404);
|
||||
expect((await fremd.get(`/api/projects/${projektId}/tasks`)).status()).toBe(404);
|
||||
expect((await fremd.patch(`/api/tasks/${aufgabenId}`, { data: { title: "x" } })).status()).toBe(
|
||||
404,
|
||||
);
|
||||
|
||||
// Adminwege bleiben zu.
|
||||
expect((await fremd.get("/api/admin/users")).status()).toBe(403);
|
||||
expect(
|
||||
(await fremd.patch("/api/admin/settings", { data: { mode: "SINGLE_USER" } })).status(),
|
||||
).toBe(403);
|
||||
|
||||
// Und das Original ist unveraendert.
|
||||
const danach = await (await request.get(`/api/projects/${projektId}`)).json();
|
||||
expect(danach.project.name).toBe("Geheimprojekt");
|
||||
expect(danach.project.tasks).toHaveLength(1);
|
||||
|
||||
await fremd.dispose();
|
||||
});
|
||||
|
||||
test("Aufgaben: Reihenfolge, abgeleiteter Fortschritt, fremde IDs", async ({ request }) => {
|
||||
await login(request, ADMIN);
|
||||
|
||||
const projekt = (
|
||||
await (await request.post("/api/projects", { data: { name: "Aufgabenprojekt" } })).json()
|
||||
).project;
|
||||
|
||||
const titel = ["eins", "zwei", "drei"];
|
||||
const ids: string[] = [];
|
||||
for (const title of titel) {
|
||||
const response = await request.post(`/api/projects/${projekt.id}/tasks`, {
|
||||
data: { title, status: "TODO" },
|
||||
});
|
||||
ids.push((await response.json()).task.id);
|
||||
}
|
||||
|
||||
// Neue Aufgaben haengen sich hinten an.
|
||||
const angelegt = (await (await request.get(`/api/projects/${projekt.id}/tasks`)).json()).tasks;
|
||||
expect(angelegt.map((task: { position: number }) => task.position)).toEqual([0, 1, 2]);
|
||||
|
||||
// Umdrehen.
|
||||
const gedreht = [...ids].reverse();
|
||||
const reorder = await request.patch(`/api/projects/${projekt.id}/tasks/reorder`, {
|
||||
data: { columns: { TODO: gedreht } },
|
||||
});
|
||||
expect(reorder.ok()).toBeTruthy();
|
||||
const nachher = (await (await request.get(`/api/projects/${projekt.id}/tasks`)).json()).tasks;
|
||||
expect(nachher.map((task: { title: string }) => task.title)).toEqual(["drei", "zwei", "eins"]);
|
||||
|
||||
// Eine nach DONE – Fortschritt folgt, sobald eingeschaltet.
|
||||
await request.patch(`/api/projects/${projekt.id}`, { data: { progressFromTasks: true } });
|
||||
await request.patch(`/api/tasks/${ids[0]}`, { data: { status: "DONE" } });
|
||||
|
||||
const mitFortschritt = (
|
||||
await (await request.get(`/api/projects/${projekt.id}`)).json()
|
||||
).project;
|
||||
expect(mitFortschritt.progress).toBe(33);
|
||||
|
||||
// Eine ID aus einem anderen Projekt darf nicht verschoben werden.
|
||||
const anderes = (
|
||||
await (await request.post("/api/projects", { data: { name: "Anderes" } })).json()
|
||||
).project;
|
||||
const fremdeAufgabe = (
|
||||
await (
|
||||
await request.post(`/api/projects/${anderes.id}/tasks`, { data: { title: "fremd" } })
|
||||
).json()
|
||||
).task;
|
||||
|
||||
const untergeschoben = await request.patch(`/api/projects/${projekt.id}/tasks/reorder`, {
|
||||
data: { columns: { DOING: [fremdeAufgabe.id] } },
|
||||
});
|
||||
const ergebnis = await untergeschoben.json();
|
||||
expect(ergebnis.updated).toBe(0);
|
||||
expect(ergebnis.ignored).toBe(1);
|
||||
|
||||
const unveraendert = (
|
||||
await (await request.get(`/api/projects/${anderes.id}/tasks`)).json()
|
||||
).tasks[0];
|
||||
expect(unveraendert.status).toBe("TODO");
|
||||
});
|
||||
|
||||
test("Export enthaelt keine Geheimnisse, Import beachtet die Strategie", async ({ request }) => {
|
||||
await login(request, ADMIN);
|
||||
|
||||
await request.post("/api/connections", {
|
||||
data: {
|
||||
name: "Mit Token",
|
||||
provider: "GITEA",
|
||||
baseUrl: "https://gitea.example.com",
|
||||
token: "streng-geheimes-token",
|
||||
},
|
||||
});
|
||||
|
||||
const roh = await (await request.get("/api/projects/export")).text();
|
||||
expect(roh).not.toContain("streng-geheimes-token");
|
||||
expect(roh).not.toContain("tokenCipher");
|
||||
expect(roh).not.toContain("ownerId");
|
||||
|
||||
const datei = JSON.parse(roh);
|
||||
const vorher = datei.projects.length;
|
||||
|
||||
// Ueberspringen aendert nichts.
|
||||
const uebersprungen = await request.post("/api/projects/import", {
|
||||
data: { data: datei, strategy: "skip", dryRun: false },
|
||||
});
|
||||
expect((await uebersprungen.json()).summary.skipped).toBe(vorher);
|
||||
|
||||
// Zusaetzlich anlegen verdoppelt.
|
||||
const zusaetzlich = await request.post("/api/projects/import", {
|
||||
data: { data: datei, strategy: "rename", dryRun: false },
|
||||
});
|
||||
expect((await zusaetzlich.json()).summary.renamed).toBe(vorher);
|
||||
|
||||
const jetzt = (await (await request.get("/api/projects")).json()).projects;
|
||||
expect(jetzt).toHaveLength(vorher * 2);
|
||||
|
||||
// Muell wird abgewiesen.
|
||||
const muell = await request.post("/api/projects/import", {
|
||||
data: { data: { irgendwas: true }, strategy: "skip", dryRun: true },
|
||||
});
|
||||
expect(muell.status()).toBe(422);
|
||||
});
|
||||
@@ -0,0 +1,62 @@
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { PrismaClient } from "@prisma/client";
|
||||
|
||||
/**
|
||||
* Bereitet die Testdatenbank vor: Schema einspielen und leeren.
|
||||
*
|
||||
* Die Datenbank muss vorher existieren. Anlegen ist bewusst nicht Teil des
|
||||
* Setups – in CI erzeugt sie der Postgres-Dienst, oertlich einmalig:
|
||||
*
|
||||
* docker exec nebula-db psql -U nebula -d postgres -c "CREATE DATABASE nebula_e2e_test"
|
||||
*/
|
||||
|
||||
const DATABASE_URL =
|
||||
process.env.E2E_DATABASE_URL ??
|
||||
"postgresql://nebula:nebula@localhost:5432/nebula_e2e_test?schema=public";
|
||||
|
||||
/**
|
||||
* Reihenfolge egal, weil CASCADE – aber vollstaendig muss sie sein, sonst
|
||||
* schleppen Laeufe Reste mit.
|
||||
*/
|
||||
const TABLES = [
|
||||
"Task",
|
||||
"Note",
|
||||
"RepoSnapshot",
|
||||
"Project",
|
||||
"Credential",
|
||||
"Session",
|
||||
"WebAuthnChallenge",
|
||||
"GitConnection",
|
||||
"User",
|
||||
"AppSettings",
|
||||
];
|
||||
|
||||
export default async function globalSetup() {
|
||||
const name = new URL(DATABASE_URL).pathname.replace(/^\//, "");
|
||||
|
||||
// Schutz vor dem teuersten aller Fehler: eine Testreihe, die die echte
|
||||
// Datenbank leert. Der Name muss "test" enthalten, sonst passiert nichts.
|
||||
if (!name.includes("test")) {
|
||||
throw new Error(
|
||||
`Die Testdatenbank heisst "${name}" und enthaelt nicht "test". ` +
|
||||
"Aus Sicherheitsgruenden abgebrochen – E2E_DATABASE_URL pruefen.",
|
||||
);
|
||||
}
|
||||
|
||||
console.log(`[e2e] Datenbank: ${name}`);
|
||||
|
||||
execFileSync("npx", ["prisma", "migrate", "deploy"], {
|
||||
env: { ...process.env, DATABASE_URL },
|
||||
stdio: "pipe",
|
||||
shell: process.platform === "win32",
|
||||
});
|
||||
|
||||
const prisma = new PrismaClient({ datasources: { db: { url: DATABASE_URL } } });
|
||||
try {
|
||||
const list = TABLES.map((table) => `"${table}"`).join(", ");
|
||||
await prisma.$executeRawUnsafe(`TRUNCATE TABLE ${list} RESTART IDENTITY CASCADE`);
|
||||
console.log("[e2e] Datenbank geleert.");
|
||||
} finally {
|
||||
await prisma.$disconnect();
|
||||
}
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
import { expect, test } from "@playwright/test";
|
||||
|
||||
/**
|
||||
* Ein Weg durch die Oberflaeche, wie ihn ein Mensch geht: anmelden, Projekt
|
||||
* anlegen, Aufgaben verwalten. Keine Vollabdeckung – die Wege, die kaputt
|
||||
* gehen duerfen, ohne dass es jemand merkt.
|
||||
*
|
||||
* Setzt voraus, dass api.spec.ts das Konto bereits angelegt hat; laeuft
|
||||
* alphabetisch danach.
|
||||
*/
|
||||
|
||||
const KONTO = { username: "chefin", password: "ein-langes-testpasswort" };
|
||||
|
||||
test.describe.configure({ mode: "serial" });
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await page.goto("/login");
|
||||
await page.fill("#login-username", KONTO.username);
|
||||
await page.fill("#login-password", KONTO.password);
|
||||
await page.click('button[type="submit"]');
|
||||
await expect(page.getByText("Vibe Coding Kontrollzentrum")).toBeVisible();
|
||||
});
|
||||
|
||||
test("Dashboard zeigt Kennzahlen und Projekte", async ({ page }) => {
|
||||
await expect(page.getByRole("heading", { name: /Deine Projekte/ })).toBeVisible();
|
||||
await expect(page.getByText("Projekte", { exact: false }).first()).toBeVisible();
|
||||
// Keine unbeabsichtigten Fehler in der Konsole.
|
||||
expect(page.url()).toContain("/");
|
||||
});
|
||||
|
||||
test("Projekt anlegen und wiederfinden", async ({ page }) => {
|
||||
await page.getByRole("button", { name: /Neues Projekt/ }).click();
|
||||
await expect(page.getByRole("dialog")).toBeVisible();
|
||||
|
||||
await page.fill("#project-name", "Oberflaechentest");
|
||||
await page.fill("#project-summary", "Von Playwright angelegt.");
|
||||
await page.getByRole("button", { name: "Projekt anlegen" }).click();
|
||||
|
||||
await expect(page.getByRole("dialog")).toBeHidden();
|
||||
await expect(page.getByText("Oberflaechentest")).toBeVisible();
|
||||
});
|
||||
|
||||
test("Aufgaben anlegen und per Ziehen verschieben", async ({ page }) => {
|
||||
await page.getByRole("link", { name: /Projekt Oberflaechentest/ }).click();
|
||||
await expect(page.getByRole("heading", { name: "Oberflaechentest" })).toBeVisible();
|
||||
|
||||
// Zwei Aufgaben ueber den Dialog anlegen.
|
||||
for (const titel of ["Erste Aufgabe", "Zweite Aufgabe"]) {
|
||||
await page.getByRole("button", { name: "Aufgabe", exact: true }).click();
|
||||
await expect(page.getByRole("dialog")).toBeVisible();
|
||||
await page.fill("#task-title", titel);
|
||||
await page.getByRole("button", { name: "Anlegen" }).click();
|
||||
await expect(page.getByRole("dialog")).toBeHidden();
|
||||
}
|
||||
|
||||
const offen = page.locator('[data-task-column="TODO"]');
|
||||
const inArbeit = page.locator('[data-task-column="DOING"]');
|
||||
await expect(offen.getByText("Erste Aufgabe")).toBeVisible();
|
||||
await expect(offen.getByText("Zweite Aufgabe")).toBeVisible();
|
||||
|
||||
// Erste Aufgabe nach "In Arbeit" ziehen.
|
||||
const griff = offen.locator('button[aria-label$="verschieben"]').first();
|
||||
const von = await griff.boundingBox();
|
||||
const nach = await inArbeit.boundingBox();
|
||||
expect(von && nach).toBeTruthy();
|
||||
|
||||
await page.mouse.move(von!.x + von!.width / 2, von!.y + von!.height / 2);
|
||||
await page.mouse.down();
|
||||
// Erst ueber die Aktivierungsschwelle des Sensors (5 Pixel) hinaus.
|
||||
await page.mouse.move(von!.x + 30, von!.y + 10, { steps: 6 });
|
||||
await page.mouse.move(nach!.x + nach!.width / 2, nach!.y + 60, { steps: 20 });
|
||||
// dnd-kit wertet die Bewegung in einem eigenen Frame aus. Ohne diese
|
||||
// Pause faende das Loslassen noch kein Ziel und die Karte spraenge zurueck.
|
||||
await page.waitForTimeout(250);
|
||||
await page.mouse.up();
|
||||
|
||||
await expect(inArbeit.getByText("Erste Aufgabe")).toBeVisible();
|
||||
|
||||
// Und der Server hat es auch so gespeichert.
|
||||
await page.reload();
|
||||
await expect(
|
||||
page.locator('[data-task-column="DOING"]').getByText("Erste Aufgabe"),
|
||||
).toBeVisible();
|
||||
});
|
||||
|
||||
test("Volltextsuche findet Notizen", async ({ page }) => {
|
||||
await page.getByRole("link", { name: /Projekt Oberflaechentest/ }).click();
|
||||
await page.getByRole("button", { name: "Notiz", exact: true }).click();
|
||||
|
||||
await page.getByPlaceholder(/Gedanken/).fill("Suchbegriff Zaunkoenig steht hier.");
|
||||
await page.getByRole("button", { name: "Speichern" }).click();
|
||||
await expect(page.getByText("Zaunkoenig", { exact: false })).toBeVisible();
|
||||
|
||||
// exact, sonst trifft es auch "Zurueck zum Dashboard".
|
||||
await page.getByRole("link", { name: "Dashboard", exact: true }).click();
|
||||
await page.getByPlaceholder(/durchsuchen/).fill("Zaunkoenig");
|
||||
|
||||
await expect(page.getByText("Treffer in Notizen")).toBeVisible();
|
||||
});
|
||||
|
||||
test("Abmelden fuehrt zurueck zur Anmeldung", async ({ page }) => {
|
||||
await page.getByRole("button", { name: /Benutzermenue/ }).click();
|
||||
await page.getByRole("menuitem", { name: "Abmelden" }).click();
|
||||
await expect(page).toHaveURL(/\/login/);
|
||||
|
||||
// Und die geschuetzte Seite ist wieder zu.
|
||||
await page.goto("/");
|
||||
await expect(page).toHaveURL(/\/login/);
|
||||
});
|
||||
Generated
+65
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "nebula",
|
||||
"version": "0.1.0",
|
||||
"version": "0.5.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "nebula",
|
||||
"version": "0.1.0",
|
||||
"version": "0.5.0",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@dnd-kit/core": "^6.3.1",
|
||||
@@ -25,6 +25,7 @@
|
||||
"zod": "^3.25.28"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.62.0",
|
||||
"@tailwindcss/postcss": "^4.1.7",
|
||||
"@types/node": "^22.15.21",
|
||||
"@types/react": "^19.1.5",
|
||||
@@ -1513,6 +1514,22 @@
|
||||
"node": ">=20.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@playwright/test": {
|
||||
"version": "1.62.0",
|
||||
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.62.0.tgz",
|
||||
"integrity": "sha512-9zOJ6ZQRAena31MpOH9VSzIz8Ou3YJ/wtY/eQm5T2uhfhG7/U3COrMS8xOtUrZrp9OgdmzEnIYODye3nY1VqzA==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright": "1.62.0"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
}
|
||||
},
|
||||
"node_modules/@prisma/client": {
|
||||
"version": "6.19.3",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/client/-/client-6.19.3.tgz",
|
||||
@@ -4489,6 +4506,52 @@
|
||||
"pathe": "^2.0.3"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright": {
|
||||
"version": "1.62.0",
|
||||
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.62.0.tgz",
|
||||
"integrity": "sha512-Z14dG305dgaLu6foB1TXQagFiW8JfSUIUaUuPaKQ6NtBPKF1P/qXcqfh6c6K/icPqdy37JmjbiBXf6JNg6Sylw==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright-core": "1.62.0"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright-core": {
|
||||
"version": "1.62.0",
|
||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.62.0.tgz",
|
||||
"integrity": "sha512-nsNRyq0r2zsG8AcRHWknc9QRA5XCueC7gWMrs+Gx2tlZn9hcl8zudfh00lhJPY1DE7NmZ6bDsT9g2yey8mXljA==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
"playwright-core": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright/node_modules/fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postcss": {
|
||||
"version": "8.5.23",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz",
|
||||
|
||||
+6
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nebula",
|
||||
"version": "0.4.0",
|
||||
"version": "0.6.0",
|
||||
"private": true,
|
||||
"description": "Nebula – Dashboard fuer Vibe-Coding Projekte mit Git-Anbindung (GitHub, GitLab, Gitea)",
|
||||
"scripts": {
|
||||
@@ -25,7 +25,10 @@
|
||||
"setup": "node scripts/setup.mjs",
|
||||
"postinstall": "prisma generate",
|
||||
"test": "vitest run",
|
||||
"test:watch": "vitest"
|
||||
"test:watch": "vitest",
|
||||
"test:e2e": "npm run build && playwright test",
|
||||
"test:e2e:ui": "playwright test --ui",
|
||||
"test:all": "npm test && npm run test:e2e"
|
||||
},
|
||||
"prisma": {
|
||||
"seed": "tsx prisma/seed.ts"
|
||||
@@ -47,6 +50,7 @@
|
||||
"zod": "^3.25.28"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.62.0",
|
||||
"@tailwindcss/postcss": "^4.1.7",
|
||||
"@types/node": "^22.15.21",
|
||||
"@types/react": "^19.1.5",
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import { defineConfig } from "@playwright/test";
|
||||
|
||||
/**
|
||||
* Ende-zu-Ende-Tests gegen die echte Anwendung.
|
||||
*
|
||||
* Playwright startet den Produktionsserver selbst und richtet ihn auf eine
|
||||
* eigene Datenbank. Der Port ist bewusst ein anderer als 3000 und 3100,
|
||||
* damit eine laufende Instanz nicht stoert.
|
||||
*
|
||||
* Voraussetzung: ein Bau (`npm run build`) und eine leere Datenbank, deren
|
||||
* Name "test" enthaelt – siehe global-setup.ts. Beides erledigt
|
||||
* `npm run test:e2e`.
|
||||
*/
|
||||
|
||||
const PORT = Number(process.env.E2E_PORT ?? 3111);
|
||||
const BASE_URL = `http://localhost:${PORT}`;
|
||||
|
||||
const DATABASE_URL =
|
||||
process.env.E2E_DATABASE_URL ??
|
||||
"postgresql://nebula:nebula@localhost:5432/nebula_e2e_test?schema=public";
|
||||
|
||||
export default defineConfig({
|
||||
testDir: "./e2e",
|
||||
// Die Tests teilen sich eine Datenbank, deshalb nacheinander.
|
||||
fullyParallel: false,
|
||||
workers: 1,
|
||||
forbidOnly: Boolean(process.env.CI),
|
||||
retries: process.env.CI ? 1 : 0,
|
||||
reporter: process.env.CI ? [["list"], ["html", { open: "never" }]] : [["list"]],
|
||||
timeout: 60_000,
|
||||
expect: { timeout: 10_000 },
|
||||
|
||||
globalSetup: "./e2e/global-setup.ts",
|
||||
|
||||
use: {
|
||||
baseURL: BASE_URL,
|
||||
locale: "de-DE",
|
||||
timezoneId: "Europe/Berlin",
|
||||
trace: "retain-on-failure",
|
||||
screenshot: "only-on-failure",
|
||||
// Oertlich der installierte Chrome, damit kein Browser geladen werden
|
||||
// muss. In CI gibt es keinen – dort das mitgelieferte Chromium
|
||||
// (siehe "playwright install chromium" im Arbeitsablauf).
|
||||
...(process.env.CI ? {} : { channel: "chrome" as const }),
|
||||
},
|
||||
|
||||
webServer: {
|
||||
command: "npm start",
|
||||
url: `${BASE_URL}/api/health`,
|
||||
reuseExistingServer: false,
|
||||
timeout: 120_000,
|
||||
stdout: "pipe",
|
||||
stderr: "pipe",
|
||||
env: {
|
||||
DATABASE_URL,
|
||||
PORT: String(PORT),
|
||||
APP_URL: BASE_URL,
|
||||
NODE_ENV: "production",
|
||||
// Fester Schluessel, damit Laeufe vergleichbar bleiben.
|
||||
APP_SECRET: "e2e-test-secret-nur-fuer-die-testlaeufe-1234567890",
|
||||
},
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,28 @@
|
||||
-- CreateEnum
|
||||
CREATE TYPE "TaskStatus" AS ENUM ('TODO', 'DOING', 'BLOCKED', 'DONE');
|
||||
|
||||
-- AlterTable
|
||||
ALTER TABLE "Project" ADD COLUMN "progressFromTasks" BOOLEAN NOT NULL DEFAULT false;
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "Task" (
|
||||
"id" TEXT NOT NULL,
|
||||
"projectId" TEXT NOT NULL,
|
||||
"title" TEXT NOT NULL,
|
||||
"description" TEXT,
|
||||
"status" "TaskStatus" NOT NULL DEFAULT 'TODO',
|
||||
"position" INTEGER NOT NULL DEFAULT 0,
|
||||
"dueDate" TIMESTAMP(3),
|
||||
"labels" TEXT[] DEFAULT ARRAY[]::TEXT[],
|
||||
"doneAt" TIMESTAMP(3),
|
||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "Task_pkey" PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "Task_projectId_status_position_idx" ON "Task"("projectId", "status", "position");
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "Task" ADD CONSTRAINT "Task_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
@@ -33,6 +33,14 @@ enum GitProvider {
|
||||
GITEA
|
||||
}
|
||||
|
||||
/// Spalten des Aufgabenbretts innerhalb eines Projekts.
|
||||
enum TaskStatus {
|
||||
TODO
|
||||
DOING
|
||||
BLOCKED
|
||||
DONE
|
||||
}
|
||||
|
||||
/// ADMIN darf Benutzer und Einstellungen verwalten. Auf fremde Projekte hat
|
||||
/// auch ein Admin keinen Zugriff – die Trennung ist bewusst hart.
|
||||
enum UserRole {
|
||||
@@ -237,7 +245,12 @@ model Project {
|
||||
ownerId String?
|
||||
owner User? @relation(fields: [ownerId], references: [id], onDelete: Cascade)
|
||||
|
||||
/// Fortschritt aus dem Verhaeltnis erledigter Aufgaben berechnen statt
|
||||
/// von Hand zu schieben. Nur sinnvoll, wenn es ueberhaupt Aufgaben gibt.
|
||||
progressFromTasks Boolean @default(false)
|
||||
|
||||
notes Note[]
|
||||
tasks Task[]
|
||||
snapshot RepoSnapshot?
|
||||
|
||||
createdAt DateTime @default(now())
|
||||
@@ -250,6 +263,30 @@ model Project {
|
||||
@@index([ownerId])
|
||||
}
|
||||
|
||||
/// Eine Aufgabe innerhalb eines Projekts – die Karten des Aufgabenbretts.
|
||||
model Task {
|
||||
id String @id @default(cuid())
|
||||
projectId String
|
||||
project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
|
||||
title String
|
||||
/// Optionale Notiz zur Aufgabe, Markdown wird dargestellt.
|
||||
description String?
|
||||
status TaskStatus @default(TODO)
|
||||
/// Rang innerhalb der Spalte. Anders als beim Projektbrett braucht es ihn
|
||||
/// hier wirklich: Aufgaben haben eine Reihenfolge, die der Benutzer setzt.
|
||||
/// Beim Umsortieren werden die Positionen einer Spalte neu durchnummeriert.
|
||||
position Int @default(0)
|
||||
dueDate DateTime?
|
||||
labels String[] @default([])
|
||||
/// Zeitpunkt, zu dem die Aufgabe nach DONE gewandert ist.
|
||||
doneAt DateTime?
|
||||
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
@@index([projectId, status, position])
|
||||
}
|
||||
|
||||
/// Freie Notizen zu einem Projekt.
|
||||
model Note {
|
||||
id String @id @default(cuid())
|
||||
|
||||
@@ -56,6 +56,7 @@ export async function GET() {
|
||||
prisma.project.findMany({
|
||||
include: {
|
||||
notes: { orderBy: { createdAt: "asc" } },
|
||||
tasks: { orderBy: [{ status: "asc" }, { position: "asc" }] },
|
||||
// Snapshots bleiben draussen: reproduzierbar und gross.
|
||||
},
|
||||
orderBy: { name: "asc" },
|
||||
|
||||
@@ -25,6 +25,7 @@ export async function GET(request: Request, { params }: Params) {
|
||||
where: { id, ownerId: auth.user.id },
|
||||
include: {
|
||||
notes: { orderBy: [{ pinned: "desc" }, { createdAt: "asc" }] },
|
||||
tasks: { orderBy: [{ status: "asc" }, { position: "asc" }] },
|
||||
connection: { select: { name: true, provider: true, baseUrl: true } },
|
||||
snapshot: true,
|
||||
},
|
||||
|
||||
@@ -4,6 +4,7 @@ import { prisma } from "@/lib/db";
|
||||
import { parseRepoUrl } from "@/lib/git";
|
||||
import { projectDetailInclude, projectListInclude, uniqueSlug } from "@/lib/projects";
|
||||
import { jsonError, readJsonBody } from "@/lib/security/request";
|
||||
import { refreshDerivedProgress } from "@/lib/tasks";
|
||||
import { formatZodError, projectUpdateSchema } from "@/lib/validation";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
@@ -75,6 +76,7 @@ export async function PATCH(request: Request, { params }: Params) {
|
||||
"tags",
|
||||
"favorite",
|
||||
"autoSync",
|
||||
"progressFromTasks",
|
||||
"connectionId",
|
||||
] as const) {
|
||||
if (data[key] !== undefined) update[key] = data[key];
|
||||
@@ -94,9 +96,16 @@ export async function PATCH(request: Request, { params }: Params) {
|
||||
if (data.repoOwner !== undefined) update.repoOwner = data.repoOwner;
|
||||
if (data.repoName !== undefined) update.repoName = data.repoName;
|
||||
|
||||
const project = await prisma.project.update({
|
||||
await prisma.project.update({ where: { id }, data: update });
|
||||
|
||||
// Wird die Ableitung eingeschaltet, soll der Wert sofort stimmen und nicht
|
||||
// erst beim naechsten Aufgabenwechsel.
|
||||
if (data.progressFromTasks === true) {
|
||||
await refreshDerivedProgress(id);
|
||||
}
|
||||
|
||||
const project = await prisma.project.findUniqueOrThrow({
|
||||
where: { id },
|
||||
data: update,
|
||||
include: projectListInclude,
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import type { Prisma, TaskStatus } from "@prisma/client";
|
||||
import { requireUserApi } from "@/lib/auth/guard";
|
||||
import { prisma } from "@/lib/db";
|
||||
import { jsonError, readJsonBody } from "@/lib/security/request";
|
||||
import { ownedProject, refreshDerivedProgress } from "@/lib/tasks";
|
||||
import { formatZodError, taskReorderSchema } from "@/lib/validation";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
type Params = { params: Promise<{ id: string }> };
|
||||
|
||||
/**
|
||||
* Neue Reihenfolge nach dem Ziehen.
|
||||
*
|
||||
* Uebergeben wird je betroffener Spalte die vollstaendige Liste der Aufgaben
|
||||
* in ihrer neuen Reihenfolge. Daraus ergeben sich Status und Position
|
||||
* eindeutig – der Aufruf ist damit wiederholbar, ohne Schaden anzurichten,
|
||||
* und ein verlorener Aufruf laesst sich einfach erneut senden.
|
||||
*/
|
||||
export async function PATCH(request: Request, { params }: Params) {
|
||||
const auth = await requireUserApi();
|
||||
if (!auth.ok) return auth.response;
|
||||
|
||||
const { id } = await params;
|
||||
if (!(await ownedProject(id, auth.user.id))) {
|
||||
return jsonError("Projekt nicht gefunden", 404);
|
||||
}
|
||||
|
||||
const body = await readJsonBody(request);
|
||||
if (!body.ok) return body.response;
|
||||
|
||||
const parsed = taskReorderSchema.safeParse(body.data);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: "Validierung fehlgeschlagen", fields: formatZodError(parsed.error) },
|
||||
{ status: 422 },
|
||||
);
|
||||
}
|
||||
|
||||
const columns = parsed.data.columns as Partial<Record<TaskStatus, string[]>>;
|
||||
const requestedIds = Object.values(columns).flat();
|
||||
|
||||
// Nur Aufgaben anfassen, die wirklich zu diesem Projekt gehoeren – sonst
|
||||
// liessen sich fremde Aufgaben ueber untergeschobene IDs verschieben.
|
||||
const owned = await prisma.task.findMany({
|
||||
where: { projectId: id, id: { in: requestedIds } },
|
||||
select: { id: true, status: true },
|
||||
});
|
||||
const ownedIds = new Set(owned.map((task) => task.id));
|
||||
const previousStatus = new Map(owned.map((task) => [task.id, task.status]));
|
||||
|
||||
const now = new Date();
|
||||
const updates: Prisma.PrismaPromise<unknown>[] = [];
|
||||
|
||||
for (const [status, ids] of Object.entries(columns) as Array<[TaskStatus, string[]]>) {
|
||||
ids.forEach((taskId, index) => {
|
||||
if (!ownedIds.has(taskId)) return;
|
||||
const before = previousStatus.get(taskId);
|
||||
updates.push(
|
||||
prisma.task.update({
|
||||
where: { id: taskId },
|
||||
data: {
|
||||
status,
|
||||
position: index,
|
||||
// doneAt nur beim tatsaechlichen Wechsel setzen oder loeschen,
|
||||
// damit ein Umsortieren innerhalb von "Erledigt" das Datum nicht
|
||||
// immer wieder erneuert.
|
||||
...(before !== status
|
||||
? { doneAt: status === "DONE" ? now : null }
|
||||
: {}),
|
||||
},
|
||||
}),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
if (updates.length > 0) {
|
||||
await prisma.$transaction(updates);
|
||||
await refreshDerivedProgress(id);
|
||||
}
|
||||
|
||||
const tasks = await prisma.task.findMany({
|
||||
where: { projectId: id },
|
||||
orderBy: [{ status: "asc" }, { position: "asc" }],
|
||||
});
|
||||
|
||||
return NextResponse.json({
|
||||
tasks,
|
||||
updated: updates.length,
|
||||
ignored: requestedIds.length - updates.length,
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { requireUserApi } from "@/lib/auth/guard";
|
||||
import { prisma } from "@/lib/db";
|
||||
import { jsonError, readJsonBody } from "@/lib/security/request";
|
||||
import { nextPosition, ownedProject, refreshDerivedProgress } from "@/lib/tasks";
|
||||
import { formatZodError, taskCreateSchema } from "@/lib/validation";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
type Params = { params: Promise<{ id: string }> };
|
||||
|
||||
export async function GET(_request: Request, { params }: Params) {
|
||||
const auth = await requireUserApi();
|
||||
if (!auth.ok) return auth.response;
|
||||
|
||||
const { id } = await params;
|
||||
if (!(await ownedProject(id, auth.user.id))) {
|
||||
return jsonError("Projekt nicht gefunden", 404);
|
||||
}
|
||||
|
||||
const tasks = await prisma.task.findMany({
|
||||
where: { projectId: id },
|
||||
orderBy: [{ status: "asc" }, { position: "asc" }],
|
||||
});
|
||||
return NextResponse.json({ tasks });
|
||||
}
|
||||
|
||||
export async function POST(request: Request, { params }: Params) {
|
||||
const auth = await requireUserApi();
|
||||
if (!auth.ok) return auth.response;
|
||||
|
||||
const { id } = await params;
|
||||
if (!(await ownedProject(id, auth.user.id))) {
|
||||
return jsonError("Projekt nicht gefunden", 404);
|
||||
}
|
||||
|
||||
const body = await readJsonBody(request);
|
||||
if (!body.ok) return body.response;
|
||||
|
||||
const parsed = taskCreateSchema.safeParse(body.data);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: "Validierung fehlgeschlagen", fields: formatZodError(parsed.error) },
|
||||
{ status: 422 },
|
||||
);
|
||||
}
|
||||
|
||||
const { title, description, status, dueDate, labels } = parsed.data;
|
||||
|
||||
const task = await prisma.task.create({
|
||||
data: {
|
||||
projectId: id,
|
||||
title,
|
||||
description: description ?? null,
|
||||
status,
|
||||
// Neue Aufgaben landen unten in ihrer Spalte.
|
||||
position: await nextPosition(id, status),
|
||||
dueDate: dueDate ? new Date(dueDate) : null,
|
||||
labels,
|
||||
doneAt: status === "DONE" ? new Date() : null,
|
||||
},
|
||||
});
|
||||
|
||||
await refreshDerivedProgress(id);
|
||||
// Damit die Sortierung nach Aktivitaet stimmt.
|
||||
await prisma.project.update({ where: { id }, data: { updatedAt: new Date() } });
|
||||
|
||||
return NextResponse.json({ task }, { status: 201 });
|
||||
}
|
||||
@@ -159,8 +159,25 @@ export async function POST(request: Request) {
|
||||
repoOwner: incoming.repoOwner ?? null,
|
||||
repoName: incoming.repoName ?? null,
|
||||
connectionId: connection?.id ?? null,
|
||||
progressFromTasks: incoming.progressFromTasks,
|
||||
};
|
||||
|
||||
const tasks = incoming.tasks.map((task, index) => ({
|
||||
title: task.title,
|
||||
description: task.description ?? null,
|
||||
status: task.status,
|
||||
// Position aus der Datei uebernehmen, notfalls die Reihenfolge in ihr.
|
||||
position: task.position ?? index,
|
||||
dueDate: task.dueDate && !Number.isNaN(Date.parse(task.dueDate))
|
||||
? new Date(task.dueDate)
|
||||
: null,
|
||||
labels: task.labels,
|
||||
doneAt: task.status === "DONE" ? new Date() : null,
|
||||
...(task.createdAt && !Number.isNaN(Date.parse(task.createdAt))
|
||||
? { createdAt: new Date(task.createdAt) }
|
||||
: {}),
|
||||
}));
|
||||
|
||||
const notes = incoming.notes.map((note) => ({
|
||||
title: note.title ?? null,
|
||||
content: note.content,
|
||||
@@ -176,9 +193,10 @@ export async function POST(request: Request) {
|
||||
// erneuter Import erzeugt keine Dubletten.
|
||||
await prisma.$transaction([
|
||||
prisma.note.deleteMany({ where: { projectId: existing.id } }),
|
||||
prisma.task.deleteMany({ where: { projectId: existing.id } }),
|
||||
prisma.project.update({
|
||||
where: { id: existing.id },
|
||||
data: { ...data, slug, notes: { create: notes } },
|
||||
data: { ...data, slug, notes: { create: notes }, tasks: { create: tasks } },
|
||||
}),
|
||||
]);
|
||||
results.push({ ...base, action: "overwrite" });
|
||||
@@ -190,6 +208,7 @@ export async function POST(request: Request) {
|
||||
ownerId: auth.user.id,
|
||||
slug: finalSlug,
|
||||
notes: { create: notes },
|
||||
tasks: { create: tasks },
|
||||
},
|
||||
});
|
||||
results.push({
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { requireUserApi } from "@/lib/auth/guard";
|
||||
import { prisma } from "@/lib/db";
|
||||
import { jsonError, readJsonBody } from "@/lib/security/request";
|
||||
import { nextPosition, refreshDerivedProgress } from "@/lib/tasks";
|
||||
import { formatZodError, taskUpdateSchema } from "@/lib/validation";
|
||||
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
type Params = { params: Promise<{ id: string }> };
|
||||
|
||||
/** Eine Aufgabe gehoert dem, dem das zugehoerige Projekt gehoert. */
|
||||
async function ownedTask(taskId: string, ownerId: string) {
|
||||
return prisma.task.findFirst({
|
||||
where: { id: taskId, project: { ownerId } },
|
||||
select: { id: true, projectId: true, status: true },
|
||||
});
|
||||
}
|
||||
|
||||
export async function PATCH(request: Request, { params }: Params) {
|
||||
const auth = await requireUserApi();
|
||||
if (!auth.ok) return auth.response;
|
||||
|
||||
const { id } = await params;
|
||||
const existing = await ownedTask(id, auth.user.id);
|
||||
if (!existing) return jsonError("Aufgabe nicht gefunden", 404);
|
||||
|
||||
const body = await readJsonBody(request);
|
||||
if (!body.ok) return body.response;
|
||||
|
||||
const parsed = taskUpdateSchema.safeParse(body.data);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: "Validierung fehlgeschlagen", fields: formatZodError(parsed.error) },
|
||||
{ status: 422 },
|
||||
);
|
||||
}
|
||||
|
||||
const data = parsed.data;
|
||||
const update: Record<string, unknown> = {};
|
||||
|
||||
if (data.title !== undefined) update.title = data.title;
|
||||
if (data.description !== undefined) update.description = data.description;
|
||||
if (data.labels !== undefined) update.labels = data.labels;
|
||||
if (data.dueDate !== undefined) {
|
||||
update.dueDate = data.dueDate ? new Date(data.dueDate) : null;
|
||||
}
|
||||
|
||||
if (data.status !== undefined && data.status !== existing.status) {
|
||||
update.status = data.status;
|
||||
// Beim Spaltenwechsel ans Ende der neuen Spalte.
|
||||
update.position = await nextPosition(existing.projectId, data.status);
|
||||
// doneAt nur setzen, wenn die Aufgabe wirklich nach DONE wandert.
|
||||
update.doneAt = data.status === "DONE" ? new Date() : null;
|
||||
}
|
||||
|
||||
const task = await prisma.task.update({ where: { id }, data: update });
|
||||
await refreshDerivedProgress(existing.projectId);
|
||||
|
||||
return NextResponse.json({ task });
|
||||
}
|
||||
|
||||
export async function DELETE(_request: Request, { params }: Params) {
|
||||
const auth = await requireUserApi();
|
||||
if (!auth.ok) return auth.response;
|
||||
|
||||
const { id } = await params;
|
||||
const existing = await ownedTask(id, auth.user.id);
|
||||
if (!existing) return jsonError("Aufgabe nicht gefunden", 404);
|
||||
|
||||
await prisma.task.delete({ where: { id } });
|
||||
await refreshDerivedProgress(existing.projectId);
|
||||
|
||||
return NextResponse.json({ ok: true });
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import { GitPanel } from "@/components/GitPanel";
|
||||
import { Markdown } from "@/components/Markdown";
|
||||
import { NotesPanel } from "@/components/NotesPanel";
|
||||
import { ProjectHeader } from "@/components/ProjectHeader";
|
||||
import { TaskBoard } from "@/components/tasks/TaskBoard";
|
||||
import { requireUserPage } from "@/lib/auth/guard";
|
||||
import { getSessionUser } from "@/lib/auth/session";
|
||||
import { prisma } from "@/lib/db";
|
||||
@@ -59,6 +60,12 @@ export default async function ProjectPage({ params }: PageProps) {
|
||||
connections={connections as unknown as ConnectionSafe[]}
|
||||
/>
|
||||
|
||||
<TaskBoard
|
||||
projectId={detail.id}
|
||||
tasks={detail.tasks}
|
||||
progressFromTasks={detail.progressFromTasks}
|
||||
/>
|
||||
|
||||
<div className="grid gap-6 lg:grid-cols-12">
|
||||
<div className="space-y-6 lg:col-span-5">
|
||||
<section className="glass p-5">
|
||||
|
||||
@@ -4,6 +4,7 @@ import Link from "next/link";
|
||||
import { useState } from "react";
|
||||
import {
|
||||
AlertTriangle,
|
||||
CheckSquare,
|
||||
GitBranch,
|
||||
GitCommitHorizontal,
|
||||
NotebookPen,
|
||||
@@ -155,6 +156,16 @@ export function ProjectCard({ project, index = 0 }: { project: ProjectListItem;
|
||||
</span>
|
||||
) : null}
|
||||
|
||||
{project._count.tasks > 0 ? (
|
||||
<span
|
||||
className="inline-flex items-center gap-1.5"
|
||||
title={`${project.tasks.length} von ${project._count.tasks} Aufgaben erledigt`}
|
||||
>
|
||||
<CheckSquare className="h-3.5 w-3.5 text-slate-500" />
|
||||
{project.tasks.length}/{project._count.tasks}
|
||||
</span>
|
||||
) : null}
|
||||
|
||||
{project._count.notes > 0 ? (
|
||||
<span className="inline-flex items-center gap-1.5">
|
||||
<NotebookPen className="h-3.5 w-3.5 text-slate-500" />
|
||||
|
||||
@@ -32,6 +32,7 @@ interface FormState {
|
||||
repoOwner: string;
|
||||
repoName: string;
|
||||
autoSync: boolean;
|
||||
progressFromTasks: boolean;
|
||||
}
|
||||
|
||||
const EMPTY: FormState = {
|
||||
@@ -49,6 +50,7 @@ const EMPTY: FormState = {
|
||||
repoOwner: "",
|
||||
repoName: "",
|
||||
autoSync: true,
|
||||
progressFromTasks: false,
|
||||
};
|
||||
|
||||
export function ProjectDialog({ open, onClose, connections, project }: ProjectDialogProps) {
|
||||
@@ -90,6 +92,7 @@ export function ProjectDialog({ open, onClose, connections, project }: ProjectDi
|
||||
repoOwner: project.repoOwner ?? "",
|
||||
repoName: project.repoName ?? "",
|
||||
autoSync: project.autoSync,
|
||||
progressFromTasks: project.progressFromTasks,
|
||||
}
|
||||
: EMPTY,
|
||||
);
|
||||
@@ -158,6 +161,7 @@ export function ProjectDialog({ open, onClose, connections, project }: ProjectDi
|
||||
repoOwner: form.repoOwner,
|
||||
repoName: form.repoName,
|
||||
autoSync: form.autoSync,
|
||||
progressFromTasks: form.progressFromTasks,
|
||||
};
|
||||
|
||||
try {
|
||||
@@ -291,9 +295,25 @@ export function ProjectDialog({ open, onClose, connections, project }: ProjectDi
|
||||
step={5}
|
||||
value={form.progress}
|
||||
onChange={(event) => update("progress", Number(event.target.value))}
|
||||
className="range"
|
||||
disabled={form.progressFromTasks}
|
||||
className={cn("range", form.progressFromTasks && "cursor-not-allowed opacity-40")}
|
||||
style={{ "--fill": `${form.progress}%` } as React.CSSProperties}
|
||||
/>
|
||||
<label className="mt-2 flex cursor-pointer items-start gap-2.5 text-sm text-slate-400">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={form.progressFromTasks}
|
||||
onChange={(event) => update("progressFromTasks", event.target.checked)}
|
||||
className="mt-0.5 h-4 w-4 accent-violet-500"
|
||||
/>
|
||||
<span>
|
||||
Aus Aufgaben berechnen
|
||||
<span className="mt-0.5 block text-[11px] text-slate-600">
|
||||
Der Fortschritt ergibt sich dann aus dem Anteil erledigter Aufgaben und
|
||||
laesst sich nicht mehr von Hand schieben.
|
||||
</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="sm:col-span-2">
|
||||
|
||||
@@ -6,6 +6,7 @@ import Link from "next/link";
|
||||
import {
|
||||
ArrowLeft,
|
||||
CalendarDays,
|
||||
CheckSquare,
|
||||
Download,
|
||||
ExternalLink,
|
||||
FileJson,
|
||||
@@ -207,7 +208,15 @@ export function ProjectHeader({
|
||||
{/* Fortschritt direkt regelbar */}
|
||||
<div className="mt-6">
|
||||
<div className="mb-2 flex items-center justify-between text-xs text-slate-500">
|
||||
<span>Fortschritt</span>
|
||||
<span className="flex items-center gap-1.5">
|
||||
Fortschritt
|
||||
{project.progressFromTasks ? (
|
||||
<span className="inline-flex items-center gap-1 rounded bg-white/6 px-1.5 py-0.5 text-[10px] text-slate-400">
|
||||
<CheckSquare className="h-2.5 w-2.5" />
|
||||
aus Aufgaben
|
||||
</span>
|
||||
) : null}
|
||||
</span>
|
||||
<span className="tabular-nums text-slate-300">{progress}%</span>
|
||||
</div>
|
||||
{/* Eigener Regler statt eines unsichtbaren Eingabefelds ueber einem
|
||||
@@ -223,7 +232,11 @@ export function ProjectHeader({
|
||||
onTouchEnd={() => patch({ progress })}
|
||||
onKeyUp={() => patch({ progress })}
|
||||
aria-label="Fortschritt anpassen"
|
||||
className="range"
|
||||
// Wird der Wert aus Aufgaben abgeleitet, waere ein Zug hier
|
||||
// wirkungslos – er wuerde beim naechsten Aufgabenwechsel wieder
|
||||
// ueberschrieben.
|
||||
disabled={project.progressFromTasks}
|
||||
className={cn("range", project.progressFromTasks && "cursor-not-allowed opacity-50")}
|
||||
style={{ "--fill": `${progress}%` } as React.CSSProperties}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,329 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import {
|
||||
DndContext,
|
||||
DragOverlay,
|
||||
PointerSensor,
|
||||
TouchSensor,
|
||||
pointerWithin,
|
||||
useDroppable,
|
||||
useSensor,
|
||||
useSensors,
|
||||
type DragEndEvent,
|
||||
type DragOverEvent,
|
||||
type DragStartEvent,
|
||||
} from "@dnd-kit/core";
|
||||
import { restrictToWindowEdges } from "@dnd-kit/modifiers";
|
||||
import { SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
|
||||
import { CSS } from "@dnd-kit/utilities";
|
||||
import { CheckSquare, Loader2, Plus } from "lucide-react";
|
||||
import type { Task, TaskStatus } from "@prisma/client";
|
||||
import { TaskCard } from "@/components/tasks/TaskCard";
|
||||
import { TaskDialog } from "@/components/tasks/TaskDialog";
|
||||
import { TASK_STATUS_META, TASK_STATUS_ORDER } from "@/lib/tasks";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
type Columns = Record<TaskStatus, Task[]>;
|
||||
|
||||
function group(tasks: Task[]): Columns {
|
||||
const columns = { TODO: [], DOING: [], BLOCKED: [], DONE: [] } as Columns;
|
||||
for (const task of [...tasks].sort((a, b) => a.position - b.position)) {
|
||||
columns[task.status].push(task);
|
||||
}
|
||||
return columns;
|
||||
}
|
||||
|
||||
/**
|
||||
* Aufgabenbrett eines Projekts.
|
||||
*
|
||||
* Anders als beim Projektbrett ist die Reihenfolge innerhalb einer Spalte
|
||||
* hier bedeutsam, deshalb @dnd-kit/sortable statt einfacher Ablageflaechen.
|
||||
* Waehrend des Ziehens fuehrt der oertliche Zustand, danach wird die neue
|
||||
* Ordnung als Ganzes gespeichert: je Spalte die vollstaendige Liste. Das ist
|
||||
* wiederholbar und kommt ohne Nachrechnen von Positionen im Browser aus.
|
||||
*/
|
||||
export function TaskBoard({
|
||||
projectId,
|
||||
tasks,
|
||||
progressFromTasks,
|
||||
}: {
|
||||
projectId: string;
|
||||
tasks: Task[];
|
||||
progressFromTasks: boolean;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const [columns, setColumns] = useState<Columns>(() => group(tasks));
|
||||
const [activeId, setActiveId] = useState<string | null>(null);
|
||||
const [editing, setEditing] = useState<Task | null>(null);
|
||||
const [creatingIn, setCreatingIn] = useState<TaskStatus | null>(null);
|
||||
const [saving, setSaving] = useState(false);
|
||||
const dragging = useRef(false);
|
||||
|
||||
// Serverstand uebernehmen, solange nicht gerade gezogen wird – sonst
|
||||
// wuerde die Karte mitten in der Bewegung zurueckspringen.
|
||||
useEffect(() => {
|
||||
if (!dragging.current) setColumns(group(tasks));
|
||||
}, [tasks]);
|
||||
|
||||
const sensors = useSensors(
|
||||
useSensor(PointerSensor, { activationConstraint: { distance: 5 } }),
|
||||
useSensor(TouchSensor, { activationConstraint: { delay: 180, tolerance: 8 } }),
|
||||
);
|
||||
|
||||
const allTasks = useMemo(() => Object.values(columns).flat(), [columns]);
|
||||
const active = activeId ? allTasks.find((task) => task.id === activeId) ?? null : null;
|
||||
const total = allTasks.length;
|
||||
const done = columns.DONE.length;
|
||||
|
||||
function containerOf(id: string): TaskStatus | null {
|
||||
if (TASK_STATUS_ORDER.includes(id as TaskStatus)) return id as TaskStatus;
|
||||
for (const status of TASK_STATUS_ORDER) {
|
||||
if (columns[status].some((task) => task.id === id)) return status;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function onDragStart(event: DragStartEvent) {
|
||||
dragging.current = true;
|
||||
setActiveId(String(event.active.id));
|
||||
}
|
||||
|
||||
/** Wechsel der Spalte passiert schon beim Darueberziehen, nicht erst beim Ablegen. */
|
||||
function onDragOver(event: DragOverEvent) {
|
||||
const activeKey = String(event.active.id);
|
||||
const overKey = event.over ? String(event.over.id) : null;
|
||||
if (!overKey) return;
|
||||
|
||||
const from = containerOf(activeKey);
|
||||
const to = containerOf(overKey);
|
||||
if (!from || !to || from === to) return;
|
||||
|
||||
setColumns((current) => {
|
||||
const moved = current[from].find((task) => task.id === activeKey);
|
||||
if (!moved) return current;
|
||||
|
||||
const targetIndex = current[to].findIndex((task) => task.id === overKey);
|
||||
const insertAt = targetIndex >= 0 ? targetIndex : current[to].length;
|
||||
|
||||
return {
|
||||
...current,
|
||||
[from]: current[from].filter((task) => task.id !== activeKey),
|
||||
[to]: [
|
||||
...current[to].slice(0, insertAt),
|
||||
{ ...moved, status: to },
|
||||
...current[to].slice(insertAt),
|
||||
],
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
async function onDragEnd(event: DragEndEvent) {
|
||||
const activeKey = String(event.active.id);
|
||||
const overKey = event.over ? String(event.over.id) : null;
|
||||
|
||||
let next = columns;
|
||||
|
||||
if (overKey) {
|
||||
const container = containerOf(activeKey);
|
||||
const overContainer = containerOf(overKey);
|
||||
if (container && container === overContainer) {
|
||||
const list = columns[container];
|
||||
const oldIndex = list.findIndex((task) => task.id === activeKey);
|
||||
const newIndex = list.findIndex((task) => task.id === overKey);
|
||||
if (oldIndex >= 0 && newIndex >= 0 && oldIndex !== newIndex) {
|
||||
const reordered = [...list];
|
||||
const [moved] = reordered.splice(oldIndex, 1);
|
||||
reordered.splice(newIndex, 0, moved);
|
||||
next = { ...columns, [container]: reordered };
|
||||
setColumns(next);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
setActiveId(null);
|
||||
dragging.current = false;
|
||||
await persist(next);
|
||||
}
|
||||
|
||||
async function persist(next: Columns) {
|
||||
setSaving(true);
|
||||
try {
|
||||
const payload = {
|
||||
columns: Object.fromEntries(
|
||||
TASK_STATUS_ORDER.map((status) => [status, next[status].map((task) => task.id)]),
|
||||
),
|
||||
};
|
||||
const response = await fetch(`/api/projects/${projectId}/tasks/reorder`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
if (!response.ok) throw new Error("failed");
|
||||
router.refresh();
|
||||
} catch {
|
||||
// Zurueck auf den Serverstand – die Bewegung war dann nur optisch.
|
||||
setColumns(group(tasks));
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="glass p-5">
|
||||
<div className="mb-4 flex flex-wrap items-center justify-between gap-3">
|
||||
<div className="flex items-center gap-3">
|
||||
<span className="grid h-9 w-9 shrink-0 place-items-center rounded-xl bg-violet-500/12 text-violet-300">
|
||||
<CheckSquare className="h-4 w-4" />
|
||||
</span>
|
||||
<div>
|
||||
<h2 className="flex items-center gap-2 text-sm font-semibold uppercase tracking-wider text-slate-200">
|
||||
Aufgaben
|
||||
{total > 0 ? (
|
||||
<span className="rounded-full bg-white/6 px-2 py-0.5 text-[11px] tabular-nums text-slate-400">
|
||||
{done}/{total}
|
||||
</span>
|
||||
) : null}
|
||||
{saving ? <Loader2 className="h-3 w-3 animate-spin text-slate-500" /> : null}
|
||||
</h2>
|
||||
<p className="mt-0.5 text-[11px] text-slate-500">
|
||||
{progressFromTasks
|
||||
? "Der Fortschritt des Projekts folgt diesen Aufgaben."
|
||||
: "Ziehen zum Verschieben und Sortieren."}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-ghost px-3 py-1.5 text-xs"
|
||||
onClick={() => setCreatingIn("TODO")}
|
||||
>
|
||||
<Plus className="h-3.5 w-3.5" />
|
||||
Aufgabe
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
collisionDetection={pointerWithin}
|
||||
modifiers={[restrictToWindowEdges]}
|
||||
onDragStart={onDragStart}
|
||||
onDragOver={onDragOver}
|
||||
onDragEnd={onDragEnd}
|
||||
onDragCancel={() => {
|
||||
setActiveId(null);
|
||||
dragging.current = false;
|
||||
setColumns(group(tasks));
|
||||
}}
|
||||
>
|
||||
<div className="grid gap-3 sm:grid-cols-2 xl:grid-cols-4">
|
||||
{TASK_STATUS_ORDER.map((status) => (
|
||||
<TaskColumn
|
||||
key={status}
|
||||
status={status}
|
||||
tasks={columns[status]}
|
||||
onAdd={() => setCreatingIn(status)}
|
||||
onEdit={setEditing}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<DragOverlay dropAnimation={{ duration: 180, easing: "cubic-bezier(0.22, 1, 0.36, 1)" }}>
|
||||
{active ? <TaskCard task={active} overlay /> : null}
|
||||
</DragOverlay>
|
||||
</DndContext>
|
||||
|
||||
<TaskDialog
|
||||
open={creatingIn !== null || editing !== null}
|
||||
projectId={projectId}
|
||||
task={editing}
|
||||
initialStatus={creatingIn ?? "TODO"}
|
||||
onClose={() => {
|
||||
setCreatingIn(null);
|
||||
setEditing(null);
|
||||
}}
|
||||
/>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
function TaskColumn({
|
||||
status,
|
||||
tasks,
|
||||
onAdd,
|
||||
onEdit,
|
||||
}: {
|
||||
status: TaskStatus;
|
||||
tasks: Task[];
|
||||
onAdd: () => void;
|
||||
onEdit: (task: Task) => void;
|
||||
}) {
|
||||
const meta = TASK_STATUS_META[status];
|
||||
const { setNodeRef, isOver } = useDroppable({ id: status });
|
||||
|
||||
return (
|
||||
<div
|
||||
ref={setNodeRef}
|
||||
data-task-column={status}
|
||||
className={cn(
|
||||
"flex min-h-[8rem] flex-col rounded-xl border border-white/6 bg-black/20 p-2 transition-colors",
|
||||
isOver && "border-violet-400/40 bg-violet-500/6",
|
||||
)}
|
||||
>
|
||||
<div className="mb-2 flex items-center gap-2 px-1">
|
||||
<span
|
||||
className="h-1.5 w-1.5 rounded-full"
|
||||
style={{ backgroundColor: meta.color }}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
<h3 className="text-[11px] font-semibold uppercase tracking-wider text-slate-400">
|
||||
{meta.label}
|
||||
</h3>
|
||||
<span className="ml-auto text-[10px] tabular-nums text-slate-600">{tasks.length}</span>
|
||||
</div>
|
||||
|
||||
<SortableContext
|
||||
items={tasks.map((task) => task.id)}
|
||||
strategy={verticalListSortingStrategy}
|
||||
>
|
||||
<div className="flex flex-1 flex-col gap-1.5">
|
||||
{tasks.map((task) => (
|
||||
<SortableTask key={task.id} task={task} onEdit={onEdit} />
|
||||
))}
|
||||
{tasks.length === 0 ? (
|
||||
<p className="rounded-lg border border-dashed border-white/8 px-2 py-4 text-center text-[10px] text-slate-600">
|
||||
{isOver ? "Hier ablegen" : "leer"}
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
</SortableContext>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={onAdd}
|
||||
className="mt-1.5 flex items-center gap-1.5 rounded-lg px-2 py-1.5 text-[11px] text-slate-600 transition-colors hover:bg-white/5 hover:text-slate-300"
|
||||
>
|
||||
<Plus className="h-3 w-3" />
|
||||
hinzufuegen
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function SortableTask({ task, onEdit }: { task: Task; onEdit: (task: Task) => void }) {
|
||||
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
||||
id: task.id,
|
||||
});
|
||||
|
||||
return (
|
||||
<div
|
||||
ref={setNodeRef}
|
||||
style={{ transform: CSS.Translate.toString(transform), transition }}
|
||||
className={cn(isDragging && "opacity-30")}
|
||||
>
|
||||
<TaskCard task={task} onEdit={onEdit} dragHandle={{ ...attributes, ...listeners }} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
"use client";
|
||||
|
||||
import { AlignLeft, CalendarClock, GripVertical } from "lucide-react";
|
||||
import type { Task } from "@prisma/client";
|
||||
import { cn, formatDate } from "@/lib/utils";
|
||||
|
||||
/** Faelligkeit einordnen: ueberfaellig, heute, demnaechst. */
|
||||
function dueTone(due: Date | string | null, done: boolean) {
|
||||
if (!due || done) return null;
|
||||
const date = new Date(due);
|
||||
if (Number.isNaN(date.getTime())) return null;
|
||||
|
||||
const today = new Date();
|
||||
today.setHours(0, 0, 0, 0);
|
||||
const target = new Date(date);
|
||||
target.setHours(0, 0, 0, 0);
|
||||
|
||||
const days = Math.round((target.getTime() - today.getTime()) / 86_400_000);
|
||||
if (days < 0) return { className: "text-rose-300", label: "ueberfaellig" };
|
||||
if (days === 0) return { className: "text-amber-300", label: "heute" };
|
||||
if (days <= 3) return { className: "text-amber-200/70", label: null };
|
||||
return { className: "text-slate-500", label: null };
|
||||
}
|
||||
|
||||
export function TaskCard({
|
||||
task,
|
||||
onEdit,
|
||||
dragHandle,
|
||||
overlay = false,
|
||||
}: {
|
||||
task: Task;
|
||||
onEdit?: (task: Task) => void;
|
||||
dragHandle?: Record<string, unknown>;
|
||||
overlay?: boolean;
|
||||
}) {
|
||||
const done = task.status === "DONE";
|
||||
const due = dueTone(task.dueDate, done);
|
||||
|
||||
return (
|
||||
<article
|
||||
className={cn(
|
||||
"group rounded-lg border border-white/8 bg-[#0b0d1c] p-2 transition-colors",
|
||||
!overlay && "hover:border-white/16",
|
||||
overlay && "rotate-2 cursor-grabbing shadow-2xl ring-1 ring-violet-400/40",
|
||||
)}
|
||||
>
|
||||
<div className="flex items-start gap-1.5">
|
||||
<button
|
||||
type="button"
|
||||
className="mt-0.5 shrink-0 cursor-grab touch-none rounded p-0.5 text-slate-700 transition-colors hover:text-slate-400 active:cursor-grabbing"
|
||||
aria-label={`${task.title} verschieben`}
|
||||
{...dragHandle}
|
||||
>
|
||||
<GripVertical className="h-3 w-3" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onEdit?.(task)}
|
||||
disabled={!onEdit}
|
||||
className="min-w-0 flex-1 text-left"
|
||||
>
|
||||
<p
|
||||
className={cn(
|
||||
"break-words text-xs leading-snug text-slate-200",
|
||||
done && "text-slate-500 line-through",
|
||||
)}
|
||||
>
|
||||
{task.title}
|
||||
</p>
|
||||
|
||||
{(task.description || task.dueDate || task.labels.length > 0) && (
|
||||
<div className="mt-1.5 flex flex-wrap items-center gap-x-2 gap-y-1 text-[10px]">
|
||||
{task.description ? (
|
||||
<AlignLeft className="h-2.5 w-2.5 text-slate-600" aria-label="hat Beschreibung" />
|
||||
) : null}
|
||||
|
||||
{task.dueDate ? (
|
||||
<span className={cn("inline-flex items-center gap-1", due?.className)}>
|
||||
<CalendarClock className="h-2.5 w-2.5" />
|
||||
{due?.label ?? formatDate(task.dueDate)}
|
||||
</span>
|
||||
) : null}
|
||||
|
||||
{task.labels.slice(0, 3).map((label) => (
|
||||
<span key={label} className="rounded bg-white/6 px-1 py-0.5 text-slate-400">
|
||||
{label}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
</article>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,233 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Loader2, Trash2 } from "lucide-react";
|
||||
import type { Task, TaskStatus } from "@prisma/client";
|
||||
import { Modal } from "@/components/ui/Modal";
|
||||
import { TASK_STATUS_META, TASK_STATUS_ORDER } from "@/lib/tasks";
|
||||
import { cn, parseTags } from "@/lib/utils";
|
||||
|
||||
/** Datum fuer <input type="date"> – ortszeitbezogen, nicht UTC. */
|
||||
function toDateInput(value: Date | string | null): string {
|
||||
if (!value) return "";
|
||||
const date = new Date(value);
|
||||
if (Number.isNaN(date.getTime())) return "";
|
||||
const offset = date.getTimezoneOffset() * 60_000;
|
||||
return new Date(date.getTime() - offset).toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
export function TaskDialog({
|
||||
open,
|
||||
projectId,
|
||||
task,
|
||||
initialStatus,
|
||||
onClose,
|
||||
}: {
|
||||
open: boolean;
|
||||
projectId: string;
|
||||
task: Task | null;
|
||||
initialStatus: TaskStatus;
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const [title, setTitle] = useState("");
|
||||
const [description, setDescription] = useState("");
|
||||
const [status, setStatus] = useState<TaskStatus>(initialStatus);
|
||||
const [dueDate, setDueDate] = useState("");
|
||||
const [labels, setLabels] = useState("");
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const isEdit = Boolean(task);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
setTitle(task?.title ?? "");
|
||||
setDescription(task?.description ?? "");
|
||||
setStatus(task?.status ?? initialStatus);
|
||||
setDueDate(toDateInput(task?.dueDate ?? null));
|
||||
setLabels(task?.labels.join(", ") ?? "");
|
||||
setError(null);
|
||||
}, [open, task, initialStatus]);
|
||||
|
||||
async function submit(event: React.FormEvent) {
|
||||
event.preventDefault();
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
|
||||
const body = {
|
||||
title,
|
||||
description,
|
||||
status,
|
||||
// Ohne Uhrzeit auf Mittag legen, damit Zeitzonenverschiebungen das
|
||||
// Datum nicht auf den Vortag ziehen.
|
||||
dueDate: dueDate ? `${dueDate}T12:00:00` : null,
|
||||
labels: parseTags(labels),
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await fetch(
|
||||
isEdit ? `/api/tasks/${task?.id}` : `/api/projects/${projectId}/tasks`,
|
||||
{
|
||||
method: isEdit ? "PATCH" : "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(body),
|
||||
},
|
||||
);
|
||||
const payload = await response.json().catch(() => ({}));
|
||||
if (!response.ok) throw new Error(payload.error ?? "Speichern fehlgeschlagen.");
|
||||
onClose();
|
||||
router.refresh();
|
||||
} catch (caught) {
|
||||
setError(caught instanceof Error ? caught.message : String(caught));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function remove() {
|
||||
if (!task) return;
|
||||
if (!window.confirm(`Aufgabe „${task.title}“ loeschen?`)) return;
|
||||
setBusy(true);
|
||||
try {
|
||||
const response = await fetch(`/api/tasks/${task.id}`, { method: "DELETE" });
|
||||
if (!response.ok) throw new Error("Loeschen fehlgeschlagen.");
|
||||
onClose();
|
||||
router.refresh();
|
||||
} catch (caught) {
|
||||
setError(caught instanceof Error ? caught.message : String(caught));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
open={open}
|
||||
onClose={onClose}
|
||||
width="md"
|
||||
title={isEdit ? "Aufgabe bearbeiten" : "Neue Aufgabe"}
|
||||
description={isEdit ? undefined : "Titel genuegt – alles andere ist optional."}
|
||||
>
|
||||
<form onSubmit={submit} className="space-y-4">
|
||||
<div>
|
||||
<label className="field-label" htmlFor="task-title">
|
||||
Titel *
|
||||
</label>
|
||||
<input
|
||||
id="task-title"
|
||||
className="field"
|
||||
value={title}
|
||||
onChange={(event) => setTitle(event.target.value)}
|
||||
required
|
||||
maxLength={200}
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<span className="field-label">Spalte</span>
|
||||
<div className="grid grid-cols-2 gap-2 sm:grid-cols-4">
|
||||
{TASK_STATUS_ORDER.map((value) => {
|
||||
const meta = TASK_STATUS_META[value];
|
||||
return (
|
||||
<button
|
||||
key={value}
|
||||
type="button"
|
||||
onClick={() => setStatus(value)}
|
||||
className={cn(
|
||||
"rounded-lg border px-2 py-2 text-xs transition-all",
|
||||
status === value
|
||||
? "border-violet-400/60 bg-violet-500/12 text-white"
|
||||
: "border-white/9 text-slate-400 hover:border-white/20",
|
||||
)}
|
||||
>
|
||||
<span className="flex items-center justify-center gap-1.5">
|
||||
<span
|
||||
className="h-1.5 w-1.5 rounded-full"
|
||||
style={{ backgroundColor: meta.color }}
|
||||
/>
|
||||
{meta.label}
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="field-label" htmlFor="task-description">
|
||||
Beschreibung
|
||||
</label>
|
||||
<textarea
|
||||
id="task-description"
|
||||
className="field min-h-24 resize-y font-mono text-[13px]"
|
||||
value={description}
|
||||
onChange={(event) => setDescription(event.target.value)}
|
||||
placeholder="Markdown wird dargestellt."
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
<div>
|
||||
<label className="field-label" htmlFor="task-due">
|
||||
Faellig am
|
||||
</label>
|
||||
<input
|
||||
id="task-due"
|
||||
className="field"
|
||||
type="date"
|
||||
value={dueDate}
|
||||
onChange={(event) => setDueDate(event.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="field-label" htmlFor="task-labels">
|
||||
Labels (kommagetrennt)
|
||||
</label>
|
||||
<input
|
||||
id="task-labels"
|
||||
className="field"
|
||||
value={labels}
|
||||
onChange={(event) => setLabels(event.target.value)}
|
||||
placeholder="bug, ui"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error ? (
|
||||
<p className="rounded-lg border border-rose-500/30 bg-rose-500/10 px-3 py-2 text-sm text-rose-200">
|
||||
{error}
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
<div className="flex items-center justify-between gap-2 pt-1">
|
||||
{isEdit ? (
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-danger px-3 py-1.5 text-xs"
|
||||
onClick={remove}
|
||||
disabled={busy}
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
Loeschen
|
||||
</button>
|
||||
) : (
|
||||
<span />
|
||||
)}
|
||||
|
||||
<div className="flex gap-2">
|
||||
<button type="button" className="btn btn-ghost" onClick={onClose} disabled={busy}>
|
||||
Abbrechen
|
||||
</button>
|
||||
<button type="submit" className="btn btn-primary" disabled={busy || !title.trim()}>
|
||||
{busy ? <Loader2 className="h-4 w-4 animate-spin" /> : null}
|
||||
{isEdit ? "Speichern" : "Anlegen"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
+6
-1
@@ -12,11 +12,16 @@ function trimmed(value: string | undefined): string | null {
|
||||
return result ? result : null;
|
||||
}
|
||||
|
||||
import packageJson from "../../package.json";
|
||||
|
||||
/**
|
||||
* Version aus der package.json – eine einzige Quelle. Vorher stand sie
|
||||
* zusaetzlich in der Fusszeile und lief prompt auseinander.
|
||||
*
|
||||
* Bewusst als Standardimport: ein benannter Import aus einer JSON-Datei
|
||||
* loest in Webpack eine Warnung aus.
|
||||
*/
|
||||
export { version as APP_VERSION } from "../../package.json";
|
||||
export const APP_VERSION: string = packageJson.version;
|
||||
|
||||
/** Anzeigename der Instanz – Seitentitel, Kopfzeile, Passkey-Dialog. */
|
||||
export const APP_NAME = trimmed(process.env.APP_NAME) ?? "Nebula";
|
||||
|
||||
@@ -27,6 +27,16 @@ export const exportedNoteSchema = z.object({
|
||||
createdAt: z.string().optional(),
|
||||
});
|
||||
|
||||
export const exportedTaskSchema = z.object({
|
||||
title: z.string().min(1).max(200),
|
||||
description: z.string().max(5000).nullable().optional(),
|
||||
status: z.enum(["TODO", "DOING", "BLOCKED", "DONE"]).optional().default("TODO"),
|
||||
position: z.number().int().min(0).optional().default(0),
|
||||
dueDate: z.string().nullable().optional(),
|
||||
labels: z.array(z.string().max(30)).max(8).optional().default([]),
|
||||
createdAt: z.string().optional(),
|
||||
});
|
||||
|
||||
export const exportedConnectionSchema = z.object({
|
||||
name: z.string().max(80),
|
||||
provider: z.enum(PROVIDERS),
|
||||
@@ -51,6 +61,8 @@ export const exportedProjectSchema = z.object({
|
||||
/** Nur zur Wiedererkennung – ohne Token. */
|
||||
connection: exportedConnectionSchema.nullable().optional(),
|
||||
notes: z.array(exportedNoteSchema).max(500).optional().default([]),
|
||||
tasks: z.array(exportedTaskSchema).max(1000).optional().default([]),
|
||||
progressFromTasks: z.boolean().optional().default(false),
|
||||
createdAt: z.string().optional(),
|
||||
});
|
||||
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
import type { GitConnection, Note, Project, RepoSnapshot } from "@prisma/client";
|
||||
import type { GitConnection, Note, Project, RepoSnapshot, Task } from "@prisma/client";
|
||||
import { APP_NAME } from "@/lib/config";
|
||||
import { prisma } from "@/lib/db";
|
||||
import { PRIORITY_META, statusOf } from "@/lib/status";
|
||||
import { formatDateTime } from "@/lib/utils";
|
||||
import { formatDate, formatDateTime } from "@/lib/utils";
|
||||
import { EXPORT_KIND, EXPORT_VERSION, type ExportFile, type ExportedProject } from "./format";
|
||||
|
||||
type ProjectForExport = Project & {
|
||||
notes: Note[];
|
||||
tasks: Task[];
|
||||
connection: Pick<GitConnection, "name" | "provider" | "baseUrl"> | null;
|
||||
};
|
||||
|
||||
@@ -40,6 +41,16 @@ export function toExportedProject(project: ProjectForExport): ExportedProject {
|
||||
pinned: note.pinned,
|
||||
createdAt: note.createdAt.toISOString(),
|
||||
})),
|
||||
tasks: project.tasks.map((task) => ({
|
||||
title: task.title,
|
||||
description: task.description,
|
||||
status: task.status,
|
||||
position: task.position,
|
||||
dueDate: task.dueDate?.toISOString() ?? null,
|
||||
labels: task.labels,
|
||||
createdAt: task.createdAt.toISOString(),
|
||||
})),
|
||||
progressFromTasks: project.progressFromTasks,
|
||||
createdAt: project.createdAt.toISOString(),
|
||||
};
|
||||
}
|
||||
@@ -63,6 +74,7 @@ export async function loadProjectsForExport(
|
||||
where: { ownerId, ...(projectId ? { id: projectId } : {}) },
|
||||
include: {
|
||||
notes: { orderBy: [{ pinned: "desc" }, { createdAt: "asc" }] },
|
||||
tasks: { orderBy: [{ status: "asc" }, { position: "asc" }] },
|
||||
connection: { select: { name: true, provider: true, baseUrl: true } },
|
||||
},
|
||||
orderBy: { name: "asc" },
|
||||
@@ -77,6 +89,13 @@ const PROVIDER_LABEL: Record<string, string> = {
|
||||
GITEA: "Gitea",
|
||||
};
|
||||
|
||||
const TASK_LABEL: Record<string, string> = {
|
||||
TODO: "Offen",
|
||||
DOING: "In Arbeit",
|
||||
BLOCKED: "Blockiert",
|
||||
DONE: "Erledigt",
|
||||
};
|
||||
|
||||
/**
|
||||
* Ein Projekt als lesbares Markdown – zum Archivieren oder als Grundlage
|
||||
* fuer ein README. Der Git-Stand kommt aus dem letzten Snapshot, damit die
|
||||
@@ -131,6 +150,21 @@ export function toMarkdown(
|
||||
lines.push("");
|
||||
}
|
||||
|
||||
if (project.tasks.length) {
|
||||
lines.push("## Aufgaben", "");
|
||||
for (const status of ["TODO", "DOING", "BLOCKED", "DONE"] as const) {
|
||||
const inColumn = project.tasks.filter((task) => task.status === status);
|
||||
if (!inColumn.length) continue;
|
||||
lines.push(`### ${TASK_LABEL[status]}`, "");
|
||||
for (const task of inColumn) {
|
||||
const box = status === "DONE" ? "[x]" : "[ ]";
|
||||
const due = task.dueDate ? ` _(faellig ${formatDate(task.dueDate)})_` : "";
|
||||
lines.push(`- ${box} ${task.title}${due}`);
|
||||
}
|
||||
lines.push("");
|
||||
}
|
||||
}
|
||||
|
||||
if (project.notes.length) {
|
||||
lines.push("## Notizen", "");
|
||||
for (const note of project.notes) {
|
||||
|
||||
+8
-2
@@ -49,7 +49,10 @@ export const connectionSafeSelect = Prisma.validator<Prisma.GitConnectionSelect>
|
||||
export const projectListInclude = Prisma.validator<Prisma.ProjectInclude>()({
|
||||
connection: { select: connectionSafeSelect },
|
||||
snapshot: true,
|
||||
_count: { select: { notes: true } },
|
||||
_count: { select: { notes: true, tasks: true } },
|
||||
// Nur die offenen Aufgaben zaehlen – fuer die Anzeige "3 von 8" auf der
|
||||
// Karte, ohne die Aufgaben selbst mitzuladen.
|
||||
tasks: { where: { status: "DONE" }, select: { id: true } },
|
||||
});
|
||||
|
||||
export const projectDetailInclude = Prisma.validator<Prisma.ProjectInclude>()({
|
||||
@@ -58,5 +61,8 @@ export const projectDetailInclude = Prisma.validator<Prisma.ProjectInclude>()({
|
||||
notes: {
|
||||
orderBy: [{ pinned: "desc" }, { updatedAt: "desc" }],
|
||||
},
|
||||
_count: { select: { notes: true } },
|
||||
tasks: {
|
||||
orderBy: [{ status: "asc" }, { position: "asc" }],
|
||||
},
|
||||
_count: { select: { notes: true, tasks: true } },
|
||||
});
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { TASK_STATUS_META, TASK_STATUS_ORDER, progressFromTasks } from "./tasks";
|
||||
|
||||
describe("progressFromTasks", () => {
|
||||
it("rechnet den Anteil erledigter Aufgaben in Prozent um", () => {
|
||||
expect(progressFromTasks(4, 1)).toBe(25);
|
||||
expect(progressFromTasks(8, 3)).toBe(38);
|
||||
expect(progressFromTasks(3, 3)).toBe(100);
|
||||
expect(progressFromTasks(5, 0)).toBe(0);
|
||||
});
|
||||
|
||||
it("gibt null zurueck, wenn es nichts zu rechnen gibt", () => {
|
||||
// Ohne Aufgaben bleibt der von Hand gesetzte Wert stehen.
|
||||
expect(progressFromTasks(0, 0)).toBeNull();
|
||||
expect(progressFromTasks(-1, 0)).toBeNull();
|
||||
});
|
||||
|
||||
it("rundet kaufmaennisch statt abzuschneiden", () => {
|
||||
// 1/3 sind 33,33 % und 2/3 sind 66,67 %.
|
||||
expect(progressFromTasks(3, 1)).toBe(33);
|
||||
expect(progressFromTasks(3, 2)).toBe(67);
|
||||
});
|
||||
});
|
||||
|
||||
describe("Spaltenreihenfolge", () => {
|
||||
it("fuehrt von offen nach erledigt", () => {
|
||||
expect(TASK_STATUS_ORDER).toEqual(["TODO", "DOING", "BLOCKED", "DONE"]);
|
||||
});
|
||||
|
||||
it("hat zu jeder Spalte eine Beschriftung und eine Farbe", () => {
|
||||
for (const status of TASK_STATUS_ORDER) {
|
||||
expect(TASK_STATUS_META[status].label).toBeTruthy();
|
||||
expect(TASK_STATUS_META[status].color).toMatch(/^#[0-9a-f]{6}$/i);
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,86 @@
|
||||
import type { TaskStatus } from "@prisma/client";
|
||||
import { prisma } from "@/lib/db";
|
||||
|
||||
/** Spaltenreihenfolge des Aufgabenbretts. */
|
||||
export const TASK_STATUS_ORDER: TaskStatus[] = ["TODO", "DOING", "BLOCKED", "DONE"];
|
||||
|
||||
export const TASK_STATUS_META: Record<
|
||||
TaskStatus,
|
||||
{ label: string; color: string; className: string }
|
||||
> = {
|
||||
TODO: {
|
||||
label: "Offen",
|
||||
color: "#94a3b8",
|
||||
className: "bg-slate-500/12 text-slate-300 ring-slate-400/25",
|
||||
},
|
||||
DOING: {
|
||||
label: "In Arbeit",
|
||||
color: "#a78bfa",
|
||||
className: "bg-violet-500/12 text-violet-200 ring-violet-400/30",
|
||||
},
|
||||
BLOCKED: {
|
||||
label: "Blockiert",
|
||||
color: "#fb7185",
|
||||
className: "bg-rose-500/12 text-rose-200 ring-rose-400/30",
|
||||
},
|
||||
DONE: {
|
||||
label: "Erledigt",
|
||||
color: "#34d399",
|
||||
className: "bg-emerald-500/12 text-emerald-200 ring-emerald-400/30",
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* Berechnet den Fortschritt aus dem Verhaeltnis erledigter Aufgaben.
|
||||
* Ohne Aufgaben gibt es nichts zu berechnen – dann bleibt der Wert, wie er ist.
|
||||
*/
|
||||
export function progressFromTasks(total: number, done: number): number | null {
|
||||
if (total <= 0) return null;
|
||||
return Math.round((done / total) * 100);
|
||||
}
|
||||
|
||||
/**
|
||||
* Schreibt den abgeleiteten Fortschritt, falls das Projekt es so eingestellt
|
||||
* hat. Wird nach jeder Aenderung an Aufgaben aufgerufen.
|
||||
*/
|
||||
export async function refreshDerivedProgress(projectId: string): Promise<void> {
|
||||
const project = await prisma.project.findUnique({
|
||||
where: { id: projectId },
|
||||
select: { progressFromTasks: true },
|
||||
});
|
||||
if (!project?.progressFromTasks) return;
|
||||
|
||||
const [total, done] = await Promise.all([
|
||||
prisma.task.count({ where: { projectId } }),
|
||||
prisma.task.count({ where: { projectId, status: "DONE" } }),
|
||||
]);
|
||||
|
||||
const value = progressFromTasks(total, done);
|
||||
if (value === null) return;
|
||||
|
||||
await prisma.project.update({
|
||||
where: { id: projectId },
|
||||
data: { progress: value },
|
||||
});
|
||||
}
|
||||
|
||||
/** Naechste freie Position am Ende einer Spalte. */
|
||||
export async function nextPosition(
|
||||
projectId: string,
|
||||
status: TaskStatus,
|
||||
): Promise<number> {
|
||||
const last = await prisma.task.findFirst({
|
||||
where: { projectId, status },
|
||||
orderBy: { position: "desc" },
|
||||
select: { position: true },
|
||||
});
|
||||
return (last?.position ?? -1) + 1;
|
||||
}
|
||||
|
||||
/** Prueft Existenz und Besitz in einem Zug. */
|
||||
export async function ownedProject(projectId: string, ownerId: string) {
|
||||
return prisma.project.findFirst({
|
||||
where: { id: projectId, ownerId },
|
||||
select: { id: true },
|
||||
});
|
||||
}
|
||||
@@ -23,10 +23,47 @@ export const projectCreateSchema = z.object({
|
||||
connectionId: z.preprocess(emptyToNull, z.string().trim().nullable().optional()),
|
||||
/** Am automatischen Abgleich teilnehmen. */
|
||||
autoSync: z.boolean().default(true),
|
||||
/** Fortschritt aus dem Verhaeltnis erledigter Aufgaben berechnen. */
|
||||
progressFromTasks: z.boolean().default(false),
|
||||
});
|
||||
|
||||
export const projectUpdateSchema = projectCreateSchema.partial();
|
||||
|
||||
// ── Aufgaben ─────────────────────────────────────────────────
|
||||
|
||||
const TASK_STATUS = ["TODO", "DOING", "BLOCKED", "DONE"] as const;
|
||||
|
||||
const dueDateField = z.preprocess(
|
||||
emptyToNull,
|
||||
z
|
||||
.string()
|
||||
.trim()
|
||||
.refine((value) => !Number.isNaN(Date.parse(value)), "Kein gueltiges Datum")
|
||||
.nullable()
|
||||
.optional(),
|
||||
);
|
||||
|
||||
export const taskCreateSchema = z.object({
|
||||
title: z.string().trim().min(1, "Titel darf nicht leer sein").max(200),
|
||||
description: z.preprocess(emptyToNull, z.string().trim().max(5000).nullable().optional()),
|
||||
status: z.enum(TASK_STATUS).default("TODO"),
|
||||
dueDate: dueDateField,
|
||||
labels: z.array(z.string().trim().min(1).max(30)).max(8).default([]),
|
||||
});
|
||||
|
||||
export const taskUpdateSchema = taskCreateSchema.partial();
|
||||
|
||||
/**
|
||||
* Neue Reihenfolge nach dem Ziehen. Uebergeben wird je betroffener Spalte
|
||||
* die vollstaendige Liste der Aufgaben in ihrer neuen Reihenfolge – daraus
|
||||
* ergeben sich Status und Position eindeutig.
|
||||
*/
|
||||
export const taskReorderSchema = z.object({
|
||||
columns: z
|
||||
.record(z.enum(TASK_STATUS), z.array(z.string().min(1)).max(500))
|
||||
.refine((value) => Object.keys(value).length > 0, "Keine Spalte angegeben"),
|
||||
});
|
||||
|
||||
export const noteCreateSchema = z.object({
|
||||
title: z.preprocess(emptyToNull, z.string().trim().max(160).nullable().optional()),
|
||||
content: z.string().trim().min(1, "Notiz darf nicht leer sein").max(20000),
|
||||
|
||||
+16
-3
@@ -1,4 +1,12 @@
|
||||
import type { GitProvider, Note, Project, ProjectStatus, RepoSnapshot } from "@prisma/client";
|
||||
import type {
|
||||
GitProvider,
|
||||
Note,
|
||||
Project,
|
||||
ProjectStatus,
|
||||
RepoSnapshot,
|
||||
Task,
|
||||
TaskStatus,
|
||||
} from "@prisma/client";
|
||||
import type {
|
||||
BranchInfo,
|
||||
CiInfo,
|
||||
@@ -30,14 +38,17 @@ export interface ConnectionWithCount extends ConnectionSafe {
|
||||
export interface ProjectListItem extends Project {
|
||||
connection: ConnectionSafe | null;
|
||||
snapshot: RepoSnapshot | null;
|
||||
_count: { notes: number };
|
||||
_count: { notes: number; tasks: number };
|
||||
/** Nur die erledigten – siehe projectListInclude. */
|
||||
tasks: { id: string }[];
|
||||
}
|
||||
|
||||
export interface ProjectDetail extends Project {
|
||||
connection: ConnectionSafe | null;
|
||||
snapshot: RepoSnapshot | null;
|
||||
notes: Note[];
|
||||
_count: { notes: number };
|
||||
tasks: Task[];
|
||||
_count: { notes: number; tasks: number };
|
||||
}
|
||||
|
||||
export interface RepoListEntry {
|
||||
@@ -60,6 +71,8 @@ export type {
|
||||
ReleaseInfo,
|
||||
RepoSnapshot,
|
||||
TagInfo,
|
||||
Task,
|
||||
TaskStatus,
|
||||
TicketInfo,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user