diff --git a/.env.example b/.env.example index 0bceb29..e4e60d7 100644 --- a/.env.example +++ b/.env.example @@ -28,6 +28,28 @@ AUTHENTIK_CLIENT_SECRET= # Var databas och uppladdningar sparas i produktion (standard ./data bredvid compose-filen) # DATA_DIR=./data +# ---------- Drift, säkerhet och loggar (alla valfria) ---------- +# Vem som är administratör (adminsidan /admin). Kommaseparerade e-postadresser. +# Saknas värdet är den äldsta användaren administratör. +# ADMIN_EMAILS=du@example.com +# Tidszon för schemalagda jobb, t.ex. nattens säkerhetskopia (standard Europe/Stockholm i produktion) +# TZ=Europe/Stockholm +# Automatisk säkerhetskopiering av alla böcker: på/av, timme på dygnet och hur många körningar som behålls +# BACKUP_ENABLED=true +# BACKUP_HOUR=3 +# BACKUP_KEEP=14 +# Hur länge borttaget ligger i papperskorgen (dagar) och hur många tidigare versioner av en post som sparas +# TRASH_DAYS=30 +# MAX_VERSIONS=30 +# Inloggningens livslängd i dagar och lagringskvot för bilder per användare (MB) +# SESSION_DAYS=14 +# USER_QUOTA_MB=2048 +# Loggar: nivå (debug, info, warn, error) och format (json eller text, JSON är standard i produktion) +# LOG_LEVEL=info +# LOG_FORMAT=json +# Prometheus-mätvärden på /api/metrics. Avstängt tills en token är satt: openssl rand -hex 24 +# METRICS_TOKEN= + # Kartor: standard är OpenStreetMaps publika servrar, som är tänkta för lätt användning. # MAP_TILE_URL=https://tile.openstreetmap.org/{z}/{x}/{y}.png # MAP_TILE_ATTRIBUTION=© OpenStreetMap-bidragsgivare diff --git a/Dockerfile b/Dockerfile index 9b0c567..6f22e13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,11 @@ RUN DATABASE_URL="postgresql://build:build@localhost:5432/build" AUTH_SECRET="bu # ---------- Produktion ---------- FROM base AS prod +# Version och bygge som visas i sidomenyn, på adminsidan och i /api/metrics +ARG APP_VERSION=dev +ARG APP_COMMIT= +ENV APP_VERSION=$APP_VERSION \ + APP_COMMIT=$APP_COMMIT ENV NODE_ENV=production \ NEXT_TELEMETRY_DISABLED=1 \ PORT=3000 \ diff --git a/README.md b/README.md index 6d993b4..1644037 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,24 @@ Alla ID skapas automatiskt enligt ID-översikten, med löpande nummer per bok oc Appar och Hemsidor har inget ID. Prefixen ligger samlade i `src/lib/ids.ts`. Sidan **ID-register** listar alla ID i boken med sökning och filter. Befintliga poster får ID vid uppgraderingen i den ordning de skapades, och tidigare handskrivna koder ersätts. +## Säkerhet och drift + +**Säkerhetskopior.** Varje natt (klockan `BACKUP_HOUR`, standard 03:00 i `TZ`) sparas en zip per bok med bilder i `./data/backups//`. De `BACKUP_KEEP` senaste körningarna (standard 14) behålls. Zip-filerna är samma format som exporten och importeras via *Importera bok*. Missade körningar tas igen vid nästa start. Administratören kan köra en säkerhetskopia direkt och ladda ner filerna på *Administration*. Kopiera gärna `backups/` till en annan maskin. + +**Papperskorg.** Borttagna poster och böcker flyttas till papperskorgen i `TRASH_DAYS` dagar (standard 30) och kan återställas. En post återställs med sina relationer, scheman och markeringar, och behåller sitt ID. En bok sparas som zip i `./data/trash` och återställs som en ny bok. Papperskorgen rensas automatiskt. + +**Ändringshistorik.** Varje ändring av en post sparar den tidigare versionen (de `MAX_VERSIONS` senaste, standard 30). *Historik* på postens sida visar skillnaderna fält för fält och kan återställa en tidigare version. Att återställa sparar först den nuvarande, så det går att ångra. Bilder ingår inte i historiken. + +**Snabbsök.** Ctrl+K (Cmd+K på Mac) öppnar en kommandopalett: sök poster (namn, ID, sammanfattning, taggar och mallfält), hoppa till en sida eller skapa något nytt. + +**Bilder.** Uppladdade bilder roteras efter EXIF, skalas ned (längsta sida 2 400 px, kartbilder 6 000 px), omkomprimeras och rensas från metadata som GPS-position. Listor använder små miniatyrer. Varje användare har en lagringskvot (`USER_QUOTA_MB`, standard 2 048 MB). + +**Härdning.** Säkerhetsrubriker sätts på alla sidor (Content-Security-Policy som släpper igenom kartservrarna från `MAP_TILE_URL` och `MAP_GEOCODER_URL`, HSTS över https, skydd mot inramning). Inloggning, import, export, sök och namnstatistik har hastighetsbegränsning per IP-adress. Inloggningen gäller i `SESSION_DAYS` dagar (standard 14). + +**Administration.** Sidan `/admin` visar version, databas- och lagringsstorlek, antal användare och böcker, säkerhetskopior och om SCB och Skatteverket går att nå. Administratör är den som anges i `ADMIN_EMAILS`, och finns inget värde är den äldsta användaren administratör. Versionen visas också i sidomenyn. Den sätts när imagen byggs: `docker build --build-arg APP_VERSION=1.0.4 --build-arg APP_COMMIT=$(git rev-parse HEAD) ...`. + +**Loggar och mätvärden.** Loggar skrivs som JSON, en rad per händelse (`LOG_LEVEL`, `LOG_FORMAT`), och serverfel loggas med sidans sökväg. Sätter du `METRICS_TOKEN` finns Prometheus-mätvärden på `/api/metrics` (anropa med `Authorization: Bearer `): antal användare, böcker och poster, databas- och bildstorlek, papperskorg, senaste lyckade säkerhetskopia, minne och antal anrop som hastighetsbegränsningen stoppat. + ## Namngenerator Under *Planering → Namngenerator* slumpas svenska namn fram. Välj kvinna, man eller slumpa, **födelseår**, efternamnstyp (alla, bara -son eller utan -son), antal förslag och om ett mellannamn ska ingå. Kopiera ett namn eller klicka *Skapa karaktär* för att starta ett formulär med namnet ifyllt. diff --git a/TODO.md b/TODO.md index aa2cc57..e669430 100644 --- a/TODO.md +++ b/TODO.md @@ -57,6 +57,9 @@ jobs: target: prod push: true tags: ${{ steps.tags.outputs.list }} + build-args: | + APP_VERSION=${{ gitea.ref_type == 'tag' && gitea.ref_name || 'main' }} + APP_COMMIT=${{ gitea.sha }} cache-from: type=registry,ref=${{ env.IMAGE }}:buildcache cache-to: type=registry,ref=${{ env.IMAGE }}:buildcache,mode=max ``` @@ -70,6 +73,12 @@ jobs: - Ladda upp en stor kartbild (10–15 MB). Gränsen för förfrågningar via inloggningskontrollen höjdes till 300 MB i samband med import och export, men en stor kartbild är inte testad. - Kör Docker-filerna på riktigt (`docker compose ... config` och en full start). Dev- och prod-compose har inte körts i miljön där koden skrevs. - Bygg imagen med den mindre Dockerfile och jämför storleken mot den gamla. +- Efter uppdateringen med säkerhetskopior, papperskorg och bildoptimering (testat lokalt, men inte i Docker): + - Att `sharp` (bildbehandling) installeras och fungerar i imagen (Debian, linux-x64) och att bilder skalas vid uppladdning. + - Att `uploads-init` ger skrivrätt till `./data/backups` och `./data/trash`, och att nattens säkerhetskopia skapas där. + - Att Content-Security-Policy inte stör inloggningen mot Authentik (omdirigeringen till och från Authentik) i en riktig miljö. + - Att `ADMIN_EMAILS` och `TZ` ger rätt administratör och rätt tid för säkerhetskopian. + - Att `/api/metrics` fungerar mot din Prometheus (sätt `METRICS_TOKEN`). ## Idéer diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index d8488fa..bec658f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -45,6 +45,9 @@ services: AUTHENTIK_CLIENT_ID: ${AUTHENTIK_CLIENT_ID:-} AUTHENTIK_CLIENT_SECRET: ${AUTHENTIK_CLIENT_SECRET:-} UPLOAD_DIR: /data/uploads + BACKUP_DIR: /data/backups + TRASH_DIR: /data/trash + BACKUP_ENABLED: ${BACKUP_ENABLED:-false} WATCHPACK_POLLING: "true" # filändringar upptäcks även via Windows/Mac-volymer NEXT_TELEMETRY_DISABLED: "1" ports: @@ -54,6 +57,8 @@ services: - node-modules:/app/node_modules # beroenden från bilden, inte från värddatorn - next-cache:/app/.next - ./data/dev/uploads:/data/uploads + - ./data/dev/backups:/data/backups + - ./data/dev/trash:/data/trash # node_modules ligger i en volym som överlever ombyggnad av bilden. Därför synkas beroenden och # Prisma-klienten vid varje start, så att nya paket och schemaändringar alltid slår igenom. command: sh -c "npm install --no-audit --no-fund && npx prisma generate && npx prisma migrate deploy && npm run dev" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 06d12fa..29e84f7 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -20,12 +20,14 @@ services: networks: - internal - # Engångssteg: ger appen (användare "node", uid 1000) skrivrätt i uppladdningsmappen på värddatorn. + # Engångssteg: ger appen (användare "node", uid 1000) skrivrätt i mapparna på värddatorn. uploads-init: image: alpine:3 - command: chown -R 1000:1000 /data/uploads + command: chown -R 1000:1000 /data/uploads /data/backups /data/trash volumes: - ${DATA_DIR:-./data}/uploads:/data/uploads + - ${DATA_DIR:-./data}/backups:/data/backups + - ${DATA_DIR:-./data}/trash:/data/trash networks: - internal @@ -52,8 +54,13 @@ services: AUTHENTIK_CLIENT_ID: ${AUTHENTIK_CLIENT_ID:?Sätt AUTHENTIK_CLIENT_ID i .env} AUTHENTIK_CLIENT_SECRET: ${AUTHENTIK_CLIENT_SECRET:?Sätt AUTHENTIK_CLIENT_SECRET i .env} UPLOAD_DIR: /data/uploads + BACKUP_DIR: /data/backups + TRASH_DIR: /data/trash + TZ: ${TZ:-Europe/Stockholm} # styr när nattens säkerhetskopia körs volumes: - ${DATA_DIR:-./data}/uploads:/data/uploads + - ${DATA_DIR:-./data}/backups:/data/backups + - ${DATA_DIR:-./data}/trash:/data/trash ports: # Lägg en omvänd proxy (Traefik, Nginx Proxy Manager, Caddy ...) framför med HTTPS. - "${APP_PORT:-3000}:3000" @@ -66,4 +73,5 @@ networks: # proxy: # external: true -# All persistent data ligger i ${DATA_DIR:-./data}/db och ${DATA_DIR:-./data}/uploads. Ta backup på mappen. +# All persistent data ligger i ${DATA_DIR:-./data}: db (databas), uploads (bilder), backups (automatiska +# säkerhetskopior) och trash (borttagna böcker). Kopiera gärna backups/ till en annan maskin. diff --git a/next.config.mjs b/next.config.mjs index 72d72aa..01c419e 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,7 +1,18 @@ /** @type {import('next').NextConfig} */ +// Statiska säkerhetsrubriker. Content-Security-Policy och HSTS beror på miljön och sätts i src/middleware.ts. +const securityHeaders = [ + { key: "X-Content-Type-Options", value: "nosniff" }, + { key: "X-Frame-Options", value: "DENY" }, + { key: "Referrer-Policy", value: "strict-origin-when-cross-origin" }, + { key: "Permissions-Policy", value: "camera=(), microphone=(), geolocation=(), payment=()" }, +]; + const nextConfig = { reactStrictMode: true, poweredByHeader: false, + async headers() { + return [{ source: "/:path*", headers: securityHeaders }]; + }, eslint: { ignoreDuringBuilds: true }, experimental: { optimizePackageImports: ["@tabler/icons-react"], diff --git a/package-lock.json b/package-lock.json index 1ec2368..10625db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,8 @@ "next-auth": "5.0.0-beta.32", "prisma": "^6.19.3", "react": "^19.1.0", - "react-dom": "^19.1.0" + "react-dom": "^19.1.0", + "sharp": "^0.34.3" }, "devDependencies": { "@types/leaflet": "^1.9.20", @@ -81,15 +82,14 @@ "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz", "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==", "license": "MIT", - "optional": true, "engines": { "node": ">=18" } }, "node_modules/@img/sharp-darwin-arm64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.5.tgz", - "integrity": "sha512-QRUlFQ0WxvdWyqqG/WtI3iupfD5rBzmCHXSdPsY91sAtVtTo7Q4cb6zOccZ3gqEqkr0f1As1ehLqmEpDsRf+lg==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz", + "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==", "cpu": [ "arm64" ], @@ -99,19 +99,19 @@ "darwin" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-arm64": "1.3.4" + "@img/sharp-libvips-darwin-arm64": "1.2.4" } }, "node_modules/@img/sharp-darwin-x64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.5.tgz", - "integrity": "sha512-+BR255RhDlpygUpOc/Jdt1nT6DQ3XG/ERo5wbcdOf5Q320dKtPCKPLR1LJs9VGXRaMa8l1uUa0tkCNOXiAxZUw==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz", + "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==", "cpu": [ "x64" ], @@ -121,38 +121,19 @@ "darwin" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-x64": "1.3.4" - } - }, - "node_modules/@img/sharp-freebsd-wasm32": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.5.tgz", - "integrity": "sha512-Y/z91nEZ4uIBX5X3nfTovjU9lHNKFYbL2lpHCLVNmXQK03VIZvXBBt0KxbPGp2SdGSF+2mQU4e+hQaWOt86iAw==", - "license": "Apache-2.0", - "optional": true, - "os": [ - "freebsd" - ], - "dependencies": { - "@img/sharp-wasm32": "0.35.5" - }, - "engines": { - "node": ">=20.9.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" + "@img/sharp-libvips-darwin-x64": "1.2.4" } }, "node_modules/@img/sharp-libvips-darwin-arm64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.4.tgz", - "integrity": "sha512-5R89nBYiRdUlSWJxPhO+GVtaXzXSxKnRu/xqMn3KTA3L9EB9Oy/P+Nn2f2vlhPuUdy/Zusb2DarbyTpGCfEDuw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz", + "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==", "cpu": [ "arm64" ], @@ -166,9 +147,9 @@ } }, "node_modules/@img/sharp-libvips-darwin-x64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.4.tgz", - "integrity": "sha512-iR2OKH80yi0U+dUplyh3/xdpFvps6YkCwsXenIJxqxR1v9o+xtKTGbS9H7cps+2Vxjc8B1j96p75NmTGjIhtpQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz", + "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==", "cpu": [ "x64" ], @@ -182,9 +163,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.4.tgz", - "integrity": "sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz", + "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==", "cpu": [ "arm" ], @@ -201,9 +182,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.4.tgz", - "integrity": "sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz", + "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==", "cpu": [ "arm64" ], @@ -220,9 +201,9 @@ } }, "node_modules/@img/sharp-libvips-linux-ppc64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.4.tgz", - "integrity": "sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz", + "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==", "cpu": [ "ppc64" ], @@ -239,9 +220,9 @@ } }, "node_modules/@img/sharp-libvips-linux-riscv64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.4.tgz", - "integrity": "sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz", + "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==", "cpu": [ "riscv64" ], @@ -258,9 +239,9 @@ } }, "node_modules/@img/sharp-libvips-linux-s390x": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.4.tgz", - "integrity": "sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz", + "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==", "cpu": [ "s390x" ], @@ -277,9 +258,9 @@ } }, "node_modules/@img/sharp-libvips-linux-x64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.4.tgz", - "integrity": "sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz", + "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==", "cpu": [ "x64" ], @@ -296,9 +277,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-arm64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.4.tgz", - "integrity": "sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz", + "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==", "cpu": [ "arm64" ], @@ -315,9 +296,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-x64": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.4.tgz", - "integrity": "sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz", + "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==", "cpu": [ "x64" ], @@ -334,9 +315,9 @@ } }, "node_modules/@img/sharp-linux-arm": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.5.tgz", - "integrity": "sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz", + "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==", "cpu": [ "arm" ], @@ -349,19 +330,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm": "1.3.4" + "@img/sharp-libvips-linux-arm": "1.2.4" } }, "node_modules/@img/sharp-linux-arm64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.5.tgz", - "integrity": "sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz", + "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==", "cpu": [ "arm64" ], @@ -374,19 +355,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm64": "1.3.4" + "@img/sharp-libvips-linux-arm64": "1.2.4" } }, "node_modules/@img/sharp-linux-ppc64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.5.tgz", - "integrity": "sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz", + "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==", "cpu": [ "ppc64" ], @@ -399,19 +380,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-ppc64": "1.3.4" + "@img/sharp-libvips-linux-ppc64": "1.2.4" } }, "node_modules/@img/sharp-linux-riscv64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.5.tgz", - "integrity": "sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz", + "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==", "cpu": [ "riscv64" ], @@ -424,19 +405,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-riscv64": "1.3.4" + "@img/sharp-libvips-linux-riscv64": "1.2.4" } }, "node_modules/@img/sharp-linux-s390x": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.5.tgz", - "integrity": "sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz", + "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==", "cpu": [ "s390x" ], @@ -449,19 +430,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-s390x": "1.3.4" + "@img/sharp-libvips-linux-s390x": "1.2.4" } }, "node_modules/@img/sharp-linux-x64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.5.tgz", - "integrity": "sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz", + "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==", "cpu": [ "x64" ], @@ -474,19 +455,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-x64": "1.3.4" + "@img/sharp-libvips-linux-x64": "1.2.4" } }, "node_modules/@img/sharp-linuxmusl-arm64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.5.tgz", - "integrity": "sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz", + "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==", "cpu": [ "arm64" ], @@ -499,19 +480,19 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-arm64": "1.3.4" + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" } }, "node_modules/@img/sharp-linuxmusl-x64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.5.tgz", - "integrity": "sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz", + "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==", "cpu": [ "x64" ], @@ -524,54 +505,38 @@ "linux" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-x64": "1.3.4" + "@img/sharp-libvips-linuxmusl-x64": "1.2.4" } }, "node_modules/@img/sharp-wasm32": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.5.tgz", - "integrity": "sha512-Ptsga1su4tQx+LLF1ECS9U6nz5kmrXKo6XVbtR48Ke3ZRxxgaWBu7IDtEe1quo8hiupwm6WFqxVlXaSf7IINGQ==", - "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", - "optional": true, - "dependencies": { - "@emnapi/runtime": "^1.11.3" - }, - "engines": { - "node": ">=20.9.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-webcontainers-wasm32": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.5.tgz", - "integrity": "sha512-hfhF/FmoQyTUkA0bIKFOtw536BQSeBMe6BF6QyWlrPxT754+TFLaZ7sKKTfvvM0yJgKgaYTwnFCIZ/GuDw5SUA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz", + "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==", "cpu": [ "wasm32" ], - "license": "Apache-2.0", + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", "optional": true, "dependencies": { - "@img/sharp-wasm32": "0.35.5" + "@emnapi/runtime": "^1.7.0" }, "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-arm64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.5.tgz", - "integrity": "sha512-X4t7g+7ZA5DKblCBEXGjUqqemj4vczING/5viFwAL8h4N3qYeyjwdCvRLHi4EdOUI+2Z7UFlp1VM+p/AuEtm6Q==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz", + "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==", "cpu": [ "arm64" ], @@ -581,16 +546,16 @@ "win32" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-ia32": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.5.tgz", - "integrity": "sha512-5Zm82LoBc43nhwNybZlG7Y1KO//Zhsn306fQl29ZOuStHLGTo3BWL83q3cznX0poxSAMuYL1On/BHBxkBeKr6A==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz", + "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==", "cpu": [ "ia32" ], @@ -600,16 +565,16 @@ "win32" ], "engines": { - "node": "^20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-x64": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.5.tgz", - "integrity": "sha512-x76eH0vEiHlcMQu8Y8IenntaACtddpT6W0wmXtWrnKcnKI7ME5DdgqhAD6SEWOEl1v2zDvkZDhFA9KnURwpfqg==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz", + "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==", "cpu": [ "x64" ], @@ -619,7 +584,7 @@ "win32" ], "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" @@ -1107,7 +1072,6 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "license": "Apache-2.0", - "optional": true, "engines": { "node": ">=8" } @@ -1537,7 +1501,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "license": "ISC", - "optional": true, "bin": { "semver": "bin/semver.js" }, @@ -1546,53 +1509,47 @@ } }, "node_modules/sharp": { - "version": "0.35.5", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.5.tgz", - "integrity": "sha512-Ywn4OnzGukp7CDMrp08RQ50YKmuwG47brZgIVPTvBaaAfQlRlygrRqSrxdCiL9M+LlzLBiJ68IR1QqvzHyjC7g==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz", + "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==", + "hasInstallScript": true, "license": "Apache-2.0", - "optional": true, "dependencies": { - "@img/colour": "^1.1.0", + "@img/colour": "^1.0.0", "detect-libc": "^2.1.2", - "semver": "^7.8.5" + "semver": "^7.7.3" }, "engines": { - "node": ">=20.9.0" + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-darwin-arm64": "0.35.5", - "@img/sharp-darwin-x64": "0.35.5", - "@img/sharp-freebsd-wasm32": "0.35.5", - "@img/sharp-libvips-darwin-arm64": "1.3.4", - "@img/sharp-libvips-darwin-x64": "1.3.4", - "@img/sharp-libvips-linux-arm": "1.3.4", - "@img/sharp-libvips-linux-arm64": "1.3.4", - "@img/sharp-libvips-linux-ppc64": "1.3.4", - "@img/sharp-libvips-linux-riscv64": "1.3.4", - "@img/sharp-libvips-linux-s390x": "1.3.4", - "@img/sharp-libvips-linux-x64": "1.3.4", - "@img/sharp-libvips-linuxmusl-arm64": "1.3.4", - "@img/sharp-libvips-linuxmusl-x64": "1.3.4", - "@img/sharp-linux-arm": "0.35.5", - "@img/sharp-linux-arm64": "0.35.5", - "@img/sharp-linux-ppc64": "0.35.5", - "@img/sharp-linux-riscv64": "0.35.5", - "@img/sharp-linux-s390x": "0.35.5", - "@img/sharp-linux-x64": "0.35.5", - "@img/sharp-linuxmusl-arm64": "0.35.5", - "@img/sharp-linuxmusl-x64": "0.35.5", - "@img/sharp-webcontainers-wasm32": "0.35.5", - "@img/sharp-win32-arm64": "0.35.5", - "@img/sharp-win32-ia32": "0.35.5", - "@img/sharp-win32-x64": "0.35.5" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } + "@img/sharp-darwin-arm64": "0.34.5", + "@img/sharp-darwin-x64": "0.34.5", + "@img/sharp-libvips-darwin-arm64": "1.2.4", + "@img/sharp-libvips-darwin-x64": "1.2.4", + "@img/sharp-libvips-linux-arm": "1.2.4", + "@img/sharp-libvips-linux-arm64": "1.2.4", + "@img/sharp-libvips-linux-ppc64": "1.2.4", + "@img/sharp-libvips-linux-riscv64": "1.2.4", + "@img/sharp-libvips-linux-s390x": "1.2.4", + "@img/sharp-libvips-linux-x64": "1.2.4", + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", + "@img/sharp-libvips-linuxmusl-x64": "1.2.4", + "@img/sharp-linux-arm": "0.34.5", + "@img/sharp-linux-arm64": "0.34.5", + "@img/sharp-linux-ppc64": "0.34.5", + "@img/sharp-linux-riscv64": "0.34.5", + "@img/sharp-linux-s390x": "0.34.5", + "@img/sharp-linux-x64": "0.34.5", + "@img/sharp-linuxmusl-arm64": "0.34.5", + "@img/sharp-linuxmusl-x64": "0.34.5", + "@img/sharp-wasm32": "0.34.5", + "@img/sharp-win32-arm64": "0.34.5", + "@img/sharp-win32-ia32": "0.34.5", + "@img/sharp-win32-x64": "0.34.5" } }, "node_modules/source-map-js": { diff --git a/package.json b/package.json index 6115949..833be91 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "next-auth": "5.0.0-beta.32", "prisma": "^6.19.3", "react": "^19.1.0", - "react-dom": "^19.1.0" + "react-dom": "^19.1.0", + "sharp": "^0.34.3" }, "devDependencies": { "@types/leaflet": "^1.9.20", diff --git a/prisma/migrations/0005_system/migration.sql b/prisma/migrations/0005_system/migration.sql new file mode 100644 index 0000000..32bc6c5 --- /dev/null +++ b/prisma/migrations/0005_system/migration.sql @@ -0,0 +1,66 @@ +-- CreateTable +CREATE TABLE "TrashItem" ( + "id" TEXT NOT NULL, + "ownerId" TEXT NOT NULL, + "bookId" TEXT, + "kind" TEXT NOT NULL, + "label" TEXT NOT NULL, + "detail" TEXT, + "payload" JSONB, + "file" TEXT, + "deletedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + + CONSTRAINT "TrashItem_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "EntityVersion" ( + "id" TEXT NOT NULL, + "bookId" TEXT NOT NULL, + "entityId" TEXT NOT NULL, + "userId" TEXT, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "snapshot" JSONB NOT NULL, + + CONSTRAINT "EntityVersion_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "BackupRun" ( + "id" TEXT NOT NULL, + "trigger" TEXT NOT NULL, + "status" TEXT NOT NULL, + "startedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "finishedAt" TIMESTAMP(3), + "books" INTEGER NOT NULL DEFAULT 0, + "megabytes" DOUBLE PRECISION NOT NULL DEFAULT 0, + "folder" TEXT, + "error" TEXT, + + CONSTRAINT "BackupRun_pkey" PRIMARY KEY ("id") +); + +-- CreateIndex +CREATE INDEX "TrashItem_ownerId_idx" ON "TrashItem"("ownerId"); + +-- CreateIndex +CREATE INDEX "TrashItem_bookId_idx" ON "TrashItem"("bookId"); + +-- CreateIndex +CREATE INDEX "TrashItem_deletedAt_idx" ON "TrashItem"("deletedAt"); + +-- CreateIndex +CREATE INDEX "EntityVersion_entityId_createdAt_idx" ON "EntityVersion"("entityId", "createdAt"); + +-- CreateIndex +CREATE INDEX "EntityVersion_bookId_idx" ON "EntityVersion"("bookId"); + +-- CreateIndex +CREATE INDEX "BackupRun_startedAt_idx" ON "BackupRun"("startedAt"); + +-- AddForeignKey +ALTER TABLE "TrashItem" ADD CONSTRAINT "TrashItem_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "EntityVersion" ADD CONSTRAINT "EntityVersion_bookId_fkey" FOREIGN KEY ("bookId") REFERENCES "Book"("id") ON DELETE CASCADE ON UPDATE CASCADE; + diff --git a/prisma/schema.prisma b/prisma/schema.prisma index f5045ac..241ee0b 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -37,13 +37,14 @@ enum WeekPattern { } model User { - id String @id @default(cuid()) + id String @id @default(cuid()) // ":", t.ex. "authentik:abc123" - externalId String @unique + externalId String @unique email String? name String? - createdAt DateTime @default(now()) + createdAt DateTime @default(now()) books Book[] + trash TrashItem[] } model Book { @@ -56,13 +57,14 @@ model Book { createdAt DateTime @default(now()) updatedAt DateTime @updatedAt - owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade) + owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade) entities Entity[] relations Relation[] shifts Shift[] maps BookMap[] templates Template[] counters IdCounter[] + versions EntityVersion[] @@index([ownerId]) } @@ -229,3 +231,53 @@ model NameStat { @@id([kind, year]) } + +// Borttagna poster och böcker. Posten sparas som en ögonblicksbild (payload) och boken som en zip-fil (file) +// tills den återställs eller rensas efter 30 dagar. +model TrashItem { + id String @id @default(cuid()) + ownerId String + bookId String? // boken en post hörde till, tom för borttagna böcker + kind String // "entity" eller "book" + label String + detail String? // t.ex. typ av post + payload Json? + file String? + deletedAt DateTime @default(now()) + + owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade) + + @@index([ownerId]) + @@index([bookId]) + @@index([deletedAt]) +} + +// Tidigare versioner av en post. entityId är medvetet ingen främmande nyckel, så att historiken överlever +// att posten flyttas till papperskorgen. +model EntityVersion { + id String @id @default(cuid()) + bookId String + entityId String + userId String? + createdAt DateTime @default(now()) + snapshot Json + + book Book @relation(fields: [bookId], references: [id], onDelete: Cascade) + + @@index([entityId, createdAt]) + @@index([bookId]) +} + +model BackupRun { + id String @id @default(cuid()) + trigger String // "schedule" eller "manual" + status String // "running", "ok" eller "error" + startedAt DateTime @default(now()) + finishedAt DateTime? + books Int @default(0) + megabytes Float @default(0) + folder String? + error String? + + @@index([startedAt]) +} diff --git a/src/actions/admin.ts b/src/actions/admin.ts new file mode 100644 index 0000000..b745ffa --- /dev/null +++ b/src/actions/admin.ts @@ -0,0 +1,18 @@ +"use server"; + +import { redirect } from "next/navigation"; +import { runBackup } from "@/lib/backup"; +import { prisma } from "@/lib/db"; +import { log } from "@/lib/log"; +import { requireAdmin } from "@/lib/session"; + +/** Startar en säkerhetskopiering i bakgrunden. Sidan visar status när den laddas om. */ +export async function runBackupNow() { + const user = await requireAdmin(); + const running = await prisma.backupRun.findFirst({ where: { status: "running", startedAt: { gte: new Date(Date.now() - 60 * 60 * 1000) } } }); + if (!running) { + log.info("Manuell säkerhetskopiering begärd", { userId: user.id }); + void runBackup("manual").catch((error) => log.error("Manuell säkerhetskopiering misslyckades", { error })); + } + redirect("/admin?started=1"); +} diff --git a/src/actions/books.ts b/src/actions/books.ts index 0b87e62..0478d35 100644 --- a/src/actions/books.ts +++ b/src/actions/books.ts @@ -3,7 +3,7 @@ import { redirect } from "next/navigation"; import { revalidatePath } from "next/cache"; import { prisma } from "@/lib/db"; -import { deleteImage } from "@/lib/files"; +import { trashBook } from "@/lib/trash"; import { optStr, revalidateBook, str } from "@/lib/form"; import { requireBook, requireUser } from "@/lib/session"; @@ -43,12 +43,8 @@ export async function updateBook(formData: FormData) { export async function deleteBook(formData: FormData) { const book = await requireBook(str(formData, "bookId")); - const [entities, maps] = await Promise.all([ - prisma.entity.findMany({ where: { bookId: book.id, imageFile: { not: null } }, select: { imageFile: true } }), - prisma.bookMap.findMany({ where: { bookId: book.id, imageFile: { not: null } }, select: { imageFile: true } }), - ]); - await prisma.book.delete({ where: { id: book.id } }); - await Promise.all([...entities, ...maps].map((row) => deleteImage(row.imageFile))); + // Boken flyttas till papperskorgen (som zip med bilder) och kan återställas i 30 dagar + await trashBook(book.ownerId, book.id); revalidatePath("/"); redirect("/"); } diff --git a/src/actions/entities.ts b/src/actions/entities.ts index 8886441..cac17b8 100644 --- a/src/actions/entities.ts +++ b/src/actions/entities.ts @@ -4,11 +4,14 @@ import type { Prisma } from "@prisma/client"; import { redirect } from "next/navigation"; import { prisma } from "@/lib/db"; import { deleteImage, isUpload, saveImage } from "@/lib/files"; +import { recordVersion, sameSnapshot, snapshotOf } from "@/lib/history"; import { optStr, parseTags, revalidateBook, str } from "@/lib/form"; import { collectFieldData } from "@/lib/field-values"; import { KIND_INFO, parseKind } from "@/lib/kinds"; import { nextEntityCode } from "@/lib/ids"; import { requireBook, requireEntity } from "@/lib/session"; +import { withinQuota } from "@/lib/storage"; +import { trashEntity } from "@/lib/trash"; import { getTemplate } from "@/lib/templates"; import { getLocale } from "@/i18n/server"; @@ -28,6 +31,9 @@ export async function saveEntity(formData: FormData) { let imageFile = existing?.imageFile ?? null; const upload = formData.get("image"); if (isUpload(upload)) { + if (!(await withinQuota(book.ownerId, upload.size))) { + redirect(existing ? `/books/${book.id}/entity/${existing.id}/edit?error=quota` : `/books/${book.id}/e/${KIND_INFO[kind].slug}/new?error=quota`); + } const saved = await saveImage(upload); await deleteImage(imageFile); imageFile = saved; @@ -47,6 +53,9 @@ export async function saveEntity(formData: FormData) { // ID skapas automatiskt vid första sparningen och ändras aldrig därefter const saved = await prisma.$transaction(async (tx) => { if (existing) { + // Den tidigare versionen sparas bara om något faktiskt ändrats + const before = snapshotOf(existing); + if (!sameSnapshot(before, snapshotOf(values))) await recordVersion(tx, book.id, existing.id, book.ownerId, before); const code = existing.code ?? (await nextEntityCode(book.id, kind, tx)); return tx.entity.update({ where: { id: existing.id }, data: { ...values, code } }); } @@ -61,8 +70,8 @@ export async function saveEntity(formData: FormData) { export async function deleteEntity(formData: FormData) { const book = await requireBook(str(formData, "bookId")); const entity = await requireEntity(book.id, str(formData, "id")); - await prisma.entity.delete({ where: { id: entity.id } }); - await deleteImage(entity.imageFile); + // Posten flyttas till papperskorgen och kan återställas i 30 dagar + await trashEntity(book.ownerId, book.id, entity.id); revalidateBook(book.id); redirect(`/books/${book.id}/e/${KIND_INFO[entity.kind].slug}`); } diff --git a/src/actions/history.ts b/src/actions/history.ts new file mode 100644 index 0000000..1ac6ca9 --- /dev/null +++ b/src/actions/history.ts @@ -0,0 +1,29 @@ +"use server"; + +import { redirect } from "next/navigation"; +import type { Prisma } from "@prisma/client"; +import { prisma } from "@/lib/db"; +import { str, revalidateBook } from "@/lib/form"; +import { recordVersion, sameSnapshot, snapshotOf, type Snapshot } from "@/lib/history"; +import { requireBook, requireEntity } from "@/lib/session"; + +/** Återställer en tidigare version. Den nuvarande versionen sparas först i historiken, så åtgärden kan ångras. */ +export async function restoreVersion(formData: FormData) { + const bookId = str(formData, "bookId"); + const book = await requireBook(bookId); + const entity = await requireEntity(bookId, str(formData, "entityId")); + const version = await prisma.entityVersion.findFirst({ where: { id: str(formData, "versionId"), entityId: entity.id, bookId } }); + if (!version) redirect(`/books/${bookId}/entity/${entity.id}/history`); + + const target = version.snapshot as unknown as Snapshot; + const current = snapshotOf(entity); + await prisma.$transaction(async (tx) => { + if (!sameSnapshot(current, target)) await recordVersion(tx, bookId, entity.id, book.ownerId, current); + await tx.entity.update({ + where: { id: entity.id }, + data: { name: target.name, summary: target.summary, tags: target.tags, data: (target.data ?? {}) as Prisma.InputJsonObject }, + }); + }); + revalidateBook(bookId); + redirect(`/books/${bookId}/entity/${entity.id}`); +} diff --git a/src/actions/maps.ts b/src/actions/maps.ts index be15f6f..80bdd5a 100644 --- a/src/actions/maps.ts +++ b/src/actions/maps.ts @@ -7,6 +7,7 @@ import { revalidateBook, str } from "@/lib/form"; import { MARKER_COLORS } from "@/lib/kinds"; import { nextMapCode, nextMarkerCode } from "@/lib/ids"; import { requireBook } from "@/lib/session"; +import { withinQuota } from "@/lib/storage"; async function requireMap(bookId: string, mapId: string) { const book = await requireBook(bookId); @@ -25,7 +26,8 @@ export async function createMap(formData: FormData) { if (kind === "IMAGE") { const upload = formData.get("image"); if (!isUpload(upload)) return; - imageFile = await saveImage(upload); + if (!(await withinQuota(book.ownerId, upload.size))) redirect(`/books/${book.id}/maps?error=quota`); + imageFile = await saveImage(upload, "map"); } const code = await nextMapCode(book.id, kind); diff --git a/src/actions/trash.ts b/src/actions/trash.ts new file mode 100644 index 0000000..59519a4 --- /dev/null +++ b/src/actions/trash.ts @@ -0,0 +1,37 @@ +"use server"; + +import { redirect } from "next/navigation"; +import { revalidatePath } from "next/cache"; +import { str } from "@/lib/form"; +import { emptyBookTrash, purgeTrashItem, restoreBook, restoreEntity } from "@/lib/trash"; +import { requireBook, requireUser } from "@/lib/session"; + +export async function restoreTrashEntity(formData: FormData) { + const user = await requireUser(); + const restored = await restoreEntity(user.id, str(formData, "id")); + if (!restored) redirect(`/books/${str(formData, "bookId")}/trash?restore=failed`); + revalidatePath(`/books/${restored.bookId}`, "layout"); + redirect(`/books/${restored.bookId}/entity/${restored.entityId}`); +} + +export async function restoreTrashBook(formData: FormData) { + const user = await requireUser(); + const bookId = await restoreBook(user.id, str(formData, "id")); + if (!bookId) redirect("/?restore=failed"); + revalidatePath("/"); + redirect(`/books/${bookId}`); +} + +export async function purgeTrash(formData: FormData) { + const user = await requireUser(); + await purgeTrashItem(user.id, str(formData, "id")); + revalidatePath("/"); + const bookId = str(formData, "bookId"); + if (bookId) revalidatePath(`/books/${bookId}/trash`); +} + +export async function emptyTrash(formData: FormData) { + const book = await requireBook(str(formData, "bookId")); + await emptyBookTrash(book.ownerId, book.id); + revalidatePath(`/books/${book.id}/trash`); +} diff --git a/src/app/(main)/page.tsx b/src/app/(main)/page.tsx index 94ac923..6bba53a 100644 --- a/src/app/(main)/page.tsx +++ b/src/app/(main)/page.tsx @@ -1,6 +1,10 @@ import Link from "next/link"; import { IconBook2 } from "@tabler/icons-react"; +import { IconArrowBackUp } from "@tabler/icons-react"; import { createBook } from "@/actions/books"; +import { purgeTrash, restoreTrashBook } from "@/actions/trash"; +import { ConfirmSubmit } from "@/components/confirm-submit"; +import { TRASH_DAYS } from "@/lib/trash"; import { IMPORT_ERROR_CODES, type ImportErrorCode } from "@/lib/book-transfer"; import { EmptyState, PageBody, PageHeader } from "@/components/page"; import { getT } from "@/i18n/server"; @@ -12,9 +16,9 @@ export const metadata = { title: "Mina böcker" }; export default async function BooksPage({ searchParams, }: { - searchParams: Promise<{ importError?: string; detail?: string }>; + searchParams: Promise<{ importError?: string; detail?: string; restore?: string }>; }) { - const { importError, detail } = await searchParams; + const { importError, detail, restore } = await searchParams; const user = await requireUser(); const { t } = await getT(); const books = await prisma.book.findMany({ @@ -22,11 +26,13 @@ export default async function BooksPage({ orderBy: { updatedAt: "desc" }, include: { _count: { select: { entities: true } } }, }); + const trashedBooks = await prisma.trashItem.findMany({ where: { ownerId: user.id, kind: "book" }, orderBy: { deletedAt: "desc" } }); return ( <> + {restore === "failed" ?
{t("trash.restoreFailed")}
: null} {importError ? (
{t("import.failed", { @@ -111,6 +117,38 @@ export default async function BooksPage({
+ + {trashedBooks.length > 0 ? ( +
+
+

{t("trash.books")}

+
+
{t("trash.intro", { days: TRASH_DAYS })}
+
+ {trashedBooks.map((item) => ( +
+
+
{item.label}
+
{t("books.items", { n: item.detail ?? 0 })}
+
+
+ + +
+
+ + + {t("trash.purge")} + +
+
+ ))} +
+
+ ) : null}
diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx new file mode 100644 index 0000000..1569d3b --- /dev/null +++ b/src/app/admin/layout.tsx @@ -0,0 +1,7 @@ +import { Shell } from "@/components/shell"; +import { requireAdmin } from "@/lib/session"; + +export default async function AdminLayout({ children }: { children: React.ReactNode }) { + const user = await requireAdmin(); + return {children}; +} diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx new file mode 100644 index 0000000..bc2a0df --- /dev/null +++ b/src/app/admin/page.tsx @@ -0,0 +1,195 @@ +import Link from "next/link"; +import { IconDatabaseExport, IconDownload, IconRefresh } from "@tabler/icons-react"; +import { runBackupNow } from "@/actions/admin"; +import { PageBody, PageHeader } from "@/components/page"; +import { getT } from "@/i18n/server"; +import { formatBytes, formatDuration } from "@/lib/format"; +import { checkExternalServices, collectStats } from "@/lib/system-stats"; + +export const metadata = { title: "Administration" }; +export const dynamic = "force-dynamic"; + +const STATUS_BADGE: Record = { ok: "bg-green-lt", error: "bg-red-lt", running: "bg-blue-lt" }; + +export default async function AdminPage({ searchParams }: { searchParams: Promise<{ started?: string; check?: string }> }) { + const { started, check } = await searchParams; + const { t } = await getT(); + const [s, services] = await Promise.all([collectStats(), check ? checkExternalServices() : Promise.resolve(null)]); + const last = s.backup.lastRun; + + const rows = (items: [string, string][]) => ( +
+ {items.map(([label, value]) => ( +
+
{label}
+
{value}
+
+ ))} +
+ ); + + return ( + <> + + +

{t("admin.intro")}

+ {started ?
{t("admin.backupStarted")}
: null} + +
+
+
+
+

{t("admin.system")}

+
+
+ {rows([ + [t("admin.version"), s.version], + [t("admin.node"), s.node], + [t("admin.uptime"), formatDuration(s.uptimeSeconds)], + [t("admin.memory"), formatBytes(s.memory.rss)], + ])} +
+
+
+ +
+
+
+

{t("admin.data")}

+
+
+ {rows([ + [t("admin.users"), String(s.counts.users)], + [t("admin.books"), String(s.counts.books)], + [t("admin.entities"), String(s.counts.entities)], + [t("admin.relations"), String(s.counts.relations)], + [t("admin.maps"), `${s.counts.maps} (${s.counts.markers} ${t("admin.markers").toLowerCase()})`], + [t("admin.dbSize"), formatBytes(s.database.bytes)], + [t("admin.uploads"), `${s.uploads.files} · ${formatBytes(s.uploads.bytes)}`], + [t("admin.thumbs"), `${s.thumbs.files} · ${formatBytes(s.thumbs.bytes)}`], + [t("admin.trash"), t("admin.trashSummary", { entities: s.trash.entities, books: s.trash.books, days: s.trash.days })], + ])} +
+
+
+ +
+
+
+

{t("admin.backup")}

+
+
+ +
+
+
+
+

+ {t("admin.backupSettings", { + enabled: s.backup.enabled ? t("admin.backupOn") : t("admin.backupOff"), + hour: s.backup.hour, + keep: s.backup.keep, + dir: s.backup.dir, + })} +

+

+ {t("admin.backupLast")}: + {last ? ( + <> + {last.startedAt.toISOString().slice(0, 16).replace("T", " ")}{" "} + {t(`admin.backupStatus.${last.status}`)} + {last.status === "ok" ? ( + · {last.books} {t("admin.books").toLowerCase()}, {formatBytes(last.megabytes * 1048576)} + ) : null} + {last.error ? · {last.error} : null} + + ) : ( + t("admin.backupNever") + )} +

+
+ {s.backup.folders.length === 0 ? ( +
{t("admin.backupNone")}
+ ) : ( +
+ + + {s.backup.folders.map((folder) => ( + + + + + + ))} + +
{folder.folder.replace("T", " ").replace(/-(\d\d)-(\d\d)$/, ":$1:$2")} + {t("admin.backupFiles", { n: folder.files.length })} · {formatBytes(folder.bytes)} + + {folder.files.map((file) => ( + + + {file.name} + + ))} +
+
+ )} +
{t("admin.backupHelp")}
+
+
+ +
+
+
+

{t("admin.services")}

+
+ + + {t("admin.check")} + +
+
+
+

{t("admin.servicesHelp")}

+ {services + ? services.map((svc) => ( +
+ {svc.ok ? "OK" : "Fel"} + {svc.name} + + {svc.detail} · {svc.ms} ms + +
+ )) + : null} +
+
+
+ +
+
+
+

{t("admin.observability")}

+
+
+ {rows([ + [t("admin.logLevel"), `${process.env.LOG_LEVEL ?? "info"} (${process.env.NODE_ENV === "production" ? "JSON" : "text"})`], + ["/api/metrics", process.env.METRICS_TOKEN ? t("admin.metricsOn") : t("admin.metricsOff")], + ])} +
{t("admin.rateLimit", { n: s.rateLimitBlocked })}
+
+
+
+
+
+ + ); +} diff --git a/src/app/api/admin/backups/[folder]/[file]/route.ts b/src/app/api/admin/backups/[folder]/[file]/route.ts new file mode 100644 index 0000000..dc39fb6 --- /dev/null +++ b/src/app/api/admin/backups/[folder]/[file]/route.ts @@ -0,0 +1,37 @@ +import { readFile } from "node:fs/promises"; +import path from "node:path"; +import { isAdminUser } from "@/lib/admin"; +import { BACKUP_DIR, BACKUP_FILE_PATTERN, FOLDER_PATTERN } from "@/lib/backup"; +import { log } from "@/lib/log"; +import { limitRequest } from "@/lib/rate-limit"; +import { getCurrentUser } from "@/lib/session"; + +export const dynamic = "force-dynamic"; + +// GET /api/admin/backups//: ladda ner en säkerhetskopia. Bara administratörer. +export async function GET(req: Request, { params }: { params: Promise<{ folder: string; file: string }> }) { + const user = await getCurrentUser(); + if (!user || !(await isAdminUser(user.id, user.email ?? null))) return new Response("Not found", { status: 404 }); + const limited = limitRequest(req, "backup-download", 30, 10 * 60_000); + if (limited) return limited; + + const { folder, file } = await params; + if (!FOLDER_PATTERN.test(folder) || !BACKUP_FILE_PATTERN.test(file)) return new Response("Not found", { status: 404 }); + + const full = path.join(BACKUP_DIR, folder, file); + if (!full.startsWith(BACKUP_DIR + path.sep)) return new Response("Not found", { status: 404 }); + + try { + const data = await readFile(full); + log.info("Säkerhetskopia nedladdad", { userId: user.id, folder, file }); + return new Response(new Uint8Array(data), { + headers: { + "Content-Type": file.endsWith(".zip") ? "application/zip" : "application/json", + "Content-Disposition": `attachment; filename="${file}"`, + "Cache-Control": "no-store", + }, + }); + } catch { + return new Response("Not found", { status: 404 }); + } +} diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts index 86c9f3d..187c744 100644 --- a/src/app/api/auth/[...nextauth]/route.ts +++ b/src/app/api/auth/[...nextauth]/route.ts @@ -1,3 +1,18 @@ +import type { NextRequest } from "next/server"; import { handlers } from "@/auth"; +import { limitRequest } from "@/lib/rate-limit"; -export const { GET, POST } = handlers; +// Inloggningsflödet begränsas per IP-adress mot upprepade försök. Sessionsanrop (/session, /csrf) går fritt. +function guarded(handler: (req: NextRequest) => Promise) { + return async (req: NextRequest) => { + const path = new URL(req.url).pathname; + if (path.includes("/callback/") || path.endsWith("/signin") || path.includes("/signin/")) { + const limited = limitRequest(req, "auth", 30, 60_000); + if (limited) return limited; + } + return handler(req); + }; +} + +export const GET = guarded(handlers.GET); +export const POST = guarded(handlers.POST); diff --git a/src/app/api/books/[bookId]/export/route.ts b/src/app/api/books/[bookId]/export/route.ts index 9b65f87..30ed026 100644 --- a/src/app/api/books/[bookId]/export/route.ts +++ b/src/app/api/books/[bookId]/export/route.ts @@ -1,6 +1,7 @@ import { strToU8, zipSync, type Zippable } from "fflate"; import { buildExport } from "@/lib/book-transfer"; import { prisma } from "@/lib/db"; +import { limitRequest } from "@/lib/rate-limit"; import { getCurrentUser } from "@/lib/session"; export const dynamic = "force-dynamic"; @@ -10,6 +11,8 @@ export const dynamic = "force-dynamic"; export async function GET(req: Request, { params }: { params: Promise<{ bookId: string }> }) { const user = await getCurrentUser(); if (!user) return new Response("Unauthorized", { status: 401 }); + const limited = limitRequest(req, "export", 30, 10 * 60_000); + if (limited) return limited; const { bookId } = await params; const book = await prisma.book.findFirst({ where: { id: bookId, ownerId: user.id }, select: { title: true } }); diff --git a/src/app/api/books/[bookId]/search/route.ts b/src/app/api/books/[bookId]/search/route.ts new file mode 100644 index 0000000..a9f9db3 --- /dev/null +++ b/src/app/api/books/[bookId]/search/route.ts @@ -0,0 +1,43 @@ +import { prisma } from "@/lib/db"; +import { limitRequest } from "@/lib/rate-limit"; +import { getCurrentUser } from "@/lib/session"; + +export const dynamic = "force-dynamic"; + +type Row = { id: string; name: string; kind: string; code: string | null; summary: string }; + +// GET /api/books//search?q=text: söker namn, ID, sammanfattning, taggar och värden i mallfält +export async function GET(req: Request, { params }: { params: Promise<{ bookId: string }> }) { + const user = await getCurrentUser(); + if (!user) return new Response("Unauthorized", { status: 401 }); + const limited = limitRequest(req, "search", 240, 60_000); + if (limited) return limited; + + const { bookId } = await params; + const book = await prisma.book.findFirst({ where: { id: bookId, ownerId: user.id }, select: { id: true } }); + if (!book) return new Response("Not found", { status: 404 }); + + const q = (new URL(req.url).searchParams.get("q") ?? "").trim().slice(0, 100); + if (q.length < 2) return Response.json({ results: [] }); + + // % och _ ska tolkas som vanliga tecken + const escaped = q.replace(/[\\%_]/g, "\\$&"); + const contains = `%${escaped}%`; + const starts = `${escaped}%`; + + const rows = await prisma.$queryRaw` + SELECT id, name, kind::text AS kind, code, left(coalesce(summary, ''), 120) AS summary + FROM "Entity" + WHERE "bookId" = ${bookId} + AND ( + name ILIKE ${contains} + OR code ILIKE ${contains} + OR summary ILIKE ${contains} + OR EXISTS (SELECT 1 FROM unnest(tags) AS tag WHERE tag ILIKE ${contains}) + OR EXISTS (SELECT 1 FROM jsonb_each_text(data) AS field WHERE field.value ILIKE ${contains}) + ) + ORDER BY (name ILIKE ${starts}) DESC, (name ILIKE ${contains}) DESC, name ASC + LIMIT 20`; + + return Response.json({ results: rows }); +} diff --git a/src/app/api/books/import/route.ts b/src/app/api/books/import/route.ts index 57ae709..d08829e 100644 --- a/src/app/api/books/import/route.ts +++ b/src/app/api/books/import/route.ts @@ -1,4 +1,5 @@ import { ImportError, MAX_IMPORT_BYTES, importBook, readImportFile } from "@/lib/book-transfer"; +import { limitRequest } from "@/lib/rate-limit"; import { getCurrentUser } from "@/lib/session"; export const dynamic = "force-dynamic"; @@ -24,6 +25,8 @@ export async function POST(req: Request) { const user = await getCurrentUser(); if (!user) return new Response("Unauthorized", { status: 401 }); if (!sameOrigin(req)) return new Response("Forbidden", { status: 403 }); + const limited = limitRequest(req, "import", 10, 10 * 60_000); + if (limited) return limited; try { const form = await req.formData(); diff --git a/src/app/api/files/[name]/route.ts b/src/app/api/files/[name]/route.ts index 429a13b..c95c491 100644 --- a/src/app/api/files/[name]/route.ts +++ b/src/app/api/files/[name]/route.ts @@ -1,11 +1,16 @@ -import { readFile } from "node:fs/promises"; +import { mkdir, readFile, writeFile } from "node:fs/promises"; import path from "node:path"; import { auth } from "@/auth"; -import { CONTENT_TYPES, FILE_NAME_PATTERN, UPLOAD_DIR } from "@/lib/files"; +import { CONTENT_TYPES, FILE_NAME_PATTERN, THUMB_DIR, UPLOAD_DIR } from "@/lib/files"; +import { makeThumbnail } from "@/lib/images"; export const dynamic = "force-dynamic"; -export async function GET(_req: Request, { params }: { params: Promise<{ name: string }> }) { +const CACHE = "private, max-age=31536000, immutable"; + +// GET /api/files/ originalbilden +// GET /api/files/?size=thumb miniatyr (skapas första gången och sparas) +export async function GET(req: Request, { params }: { params: Promise<{ name: string }> }) { const session = await auth(); if (!session?.user) return new Response("Unauthorized", { status: 401 }); @@ -13,12 +18,27 @@ export async function GET(_req: Request, { params }: { params: Promise<{ name: s if (!FILE_NAME_PATTERN.test(name)) return new Response("Not found", { status: 404 }); try { + if (new URL(req.url).searchParams.get("size") === "thumb") { + const thumbPath = path.join(THUMB_DIR, `${name}.webp`); + let thumb: Uint8Array; + try { + thumb = await readFile(thumbPath); + } catch { + thumb = await makeThumbnail(await readFile(path.join(UPLOAD_DIR, name))); + await mkdir(THUMB_DIR, { recursive: true }); + await writeFile(thumbPath, thumb); + } + return new Response(new Uint8Array(thumb), { + headers: { "Content-Type": "image/webp", "Cache-Control": CACHE, "X-Content-Type-Options": "nosniff" }, + }); + } + const data = await readFile(path.join(UPLOAD_DIR, name)); const ext = name.split(".").pop() ?? ""; return new Response(new Uint8Array(data), { headers: { "Content-Type": CONTENT_TYPES[ext] ?? "application/octet-stream", - "Cache-Control": "private, max-age=31536000, immutable", + "Cache-Control": CACHE, "X-Content-Type-Options": "nosniff", }, }); diff --git a/src/app/api/metrics/route.ts b/src/app/api/metrics/route.ts new file mode 100644 index 0000000..0f9908c --- /dev/null +++ b/src/app/api/metrics/route.ts @@ -0,0 +1,48 @@ +import { timingSafeEqual } from "node:crypto"; +import { collectStats } from "@/lib/system-stats"; +import { APP_VERSION } from "@/lib/version"; + +export const dynamic = "force-dynamic"; + +function validToken(req: Request): boolean { + const expected = process.env.METRICS_TOKEN; + if (!expected) return false; + const header = req.headers.get("authorization") ?? ""; + const given = header.startsWith("Bearer ") ? header.slice(7) : ""; + const a = Buffer.from(given); + const b = Buffer.from(expected); + return a.length === b.length && timingSafeEqual(a, b); +} + +const esc = (value: string) => value.replace(/\\/g, "\\\\").replace(/"/g, '\\"'); + +// Prometheus-mätvärden. Avstängt (404) tills METRICS_TOKEN är satt. Anropa med: Authorization: Bearer +export async function GET(req: Request) { + if (!process.env.METRICS_TOKEN) return new Response("Not found", { status: 404 }); + if (!validToken(req)) return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } }); + + const s = await collectStats(); + const lines: string[] = []; + const gauge = (name: string, help: string, value: number, labels = "", type: "gauge" | "counter" = "gauge") => { + lines.push(`# HELP bookmanager_${name} ${help}`, `# TYPE bookmanager_${name} ${type}`, `bookmanager_${name}${labels} ${value}`); + }; + + gauge("info", "Bygginformation", 1, `{version="${esc(APP_VERSION)}"}`); + gauge("uptime_seconds", "Sekunder sedan processen startade", s.uptimeSeconds); + gauge("process_resident_memory_bytes", "Resident minnesanvändning", s.memory.rss); + gauge("process_heap_used_bytes", "Använd heap", s.memory.heapUsed); + for (const [name, value] of Object.entries(s.counts)) gauge(name, `Antal ${name}`, value); + gauge("database_size_bytes", "Databasens storlek", s.database.bytes); + gauge("uploads_bytes", "Uppladdade bilder, storlek", s.uploads.bytes); + gauge("uploads_files", "Uppladdade bilder, antal", s.uploads.files); + gauge("trash_entities", "Poster i papperskorgen", s.trash.entities); + gauge("trash_books", "Böcker i papperskorgen", s.trash.books); + gauge("backups_bytes", "Säkerhetskopior, storlek", s.backup.bytes); + gauge("backup_last_success_timestamp_seconds", "Tidpunkt för senaste lyckade säkerhetskopia", s.backup.lastOk ? Math.floor(s.backup.lastOk.startedAt.getTime() / 1000) : 0); + gauge("backup_last_run_ok", "1 om senaste körningen lyckades, annars 0", s.backup.lastRun?.status === "ok" ? 1 : 0); + gauge("backup_runs_ok_total", "Lyckade säkerhetskopieringar", s.backup.runsOk, "", "counter"); + gauge("backup_runs_error_total", "Misslyckade säkerhetskopieringar", s.backup.runsError, "", "counter"); + gauge("rate_limit_blocked_total", "Anrop som stoppats av hastighetsbegränsningen sedan start", s.rateLimitBlocked, "", "counter"); + + return new Response(lines.join("\n") + "\n", { headers: { "Content-Type": "text/plain; version=0.0.4; charset=utf-8", "Cache-Control": "no-store" } }); +} diff --git a/src/app/api/names/route.ts b/src/app/api/names/route.ts index 64dc288..3983cfb 100644 --- a/src/app/api/names/route.ts +++ b/src/app/api/names/route.ts @@ -1,5 +1,6 @@ import { auth } from "@/auth"; import { getGivenNames, getSurnames } from "@/lib/name-stats"; +import { limitRequest } from "@/lib/rate-limit"; export const dynamic = "force-dynamic"; @@ -7,6 +8,8 @@ export const dynamic = "force-dynamic"; export async function GET(req: Request) { const session = await auth(); if (!session?.user) return new Response("Unauthorized", { status: 401 }); + const limited = limitRequest(req, "names", 120, 60_000); + if (limited) return limited; const url = new URL(req.url); const type = url.searchParams.get("type"); diff --git a/src/app/books/[bookId]/e/[kind]/new/page.tsx b/src/app/books/[bookId]/e/[kind]/new/page.tsx index e92c315..a0ccb3a 100644 --- a/src/app/books/[bookId]/e/[kind]/new/page.tsx +++ b/src/app/books/[bookId]/e/[kind]/new/page.tsx @@ -13,10 +13,10 @@ export default async function NewEntityPage({ searchParams, }: { params: Promise<{ bookId: string; kind: string }>; - searchParams: Promise<{ name?: string }>; + searchParams: Promise<{ name?: string; error?: string }>; }) { const { bookId, kind: slug } = await params; - const { name } = await searchParams; + const { name, error } = await searchParams; await requireBook(bookId); const info = KIND_BY_SLUG.get(slug); if (!info) notFound(); @@ -32,6 +32,7 @@ export default async function NewEntityPage({ <> + {error === "quota" ?
{t("quota.exceeded")}
: null} {entities.map((entity) => { - const image = fileUrl(entity.imageFile); + const image = fileUrl(entity.imageFile, "thumb"); return ( diff --git a/src/app/books/[bookId]/entity/[entityId]/edit/page.tsx b/src/app/books/[bookId]/entity/[entityId]/edit/page.tsx index d556951..2e398e3 100644 --- a/src/app/books/[bookId]/entity/[entityId]/edit/page.tsx +++ b/src/app/books/[bookId]/entity/[entityId]/edit/page.tsx @@ -6,8 +6,15 @@ import { prisma } from "@/lib/db"; import { requireEntity } from "@/lib/session"; import { getTemplate } from "@/lib/templates"; -export default async function EditEntityPage({ params }: { params: Promise<{ bookId: string; entityId: string }> }) { +export default async function EditEntityPage({ + params, + searchParams, +}: { + params: Promise<{ bookId: string; entityId: string }>; + searchParams: Promise<{ error?: string }>; +}) { const { bookId, entityId } = await params; + const { error } = await searchParams; const entity = await requireEntity(bookId, entityId); const { t, locale } = await getT(); const { fields } = await getTemplate(bookId, entity.kind, locale); @@ -21,6 +28,7 @@ export default async function EditEntityPage({ params }: { params: Promise<{ boo <> + {error === "quota" ?
{t("quota.exceeded")}
: null} }) { + const { bookId, entityId } = await params; + const entity = await requireEntity(bookId, entityId); + const { t, locale } = await getT(); + const { fields } = await getTemplate(bookId, entity.kind, locale); + + const versions = await prisma.entityVersion.findMany({ where: { entityId, bookId }, orderBy: { createdAt: "desc" } }); + const users = await prisma.user.findMany({ + where: { id: { in: [...new Set(versions.map((v) => v.userId).filter((id): id is string => !!id))] } }, + select: { id: true, name: true, email: true }, + }); + const userName = new Map(users.map((u) => [u.id, u.name ?? u.email ?? ""])); + const labels = { name: t("common.name"), summary: t("common.summary"), tags: t("common.tags") }; + + // Varje version jämförs med det som kom efter den (nästa version, eller nuvarande för den senaste) + let newer: Snapshot = snapshotOf(entity); + const rows = versions.map((version) => { + const snapshot = version.snapshot as unknown as Snapshot; + const changes = diffSnapshots(snapshot, newer, fields, labels); + newer = snapshot; + return { version, changes }; + }); + + return ( + <> + + {entity.name} + + } + /> + +

{t("history.intro", { n: MAX_VERSIONS })}

+ {rows.length === 0 ? ( +
+
+ {t("history.empty")} +
+
+ ) : ( + rows.map(({ version, changes }) => ( +
+
+

+ {version.createdAt.toISOString().slice(0, 16).replace("T", " ")} + {version.userId && userName.get(version.userId) ? ( + · {userName.get(version.userId)} + ) : null} +

+
+
+ + + + + + {t("history.restore")} + +
+
+
+
+ {changes.length === 0 ?
{t("history.noChanges")}
: null} + {changes.map((change) => ( +
+
{change.label}
+
+
+
{t("history.before")}
+
{change.before || —}
+
+
+
{t("history.after")}
+
{change.after || —}
+
+
+
+ ))} +
+
+ )) + )} +
+ + ); +} diff --git a/src/app/books/[bookId]/entity/[entityId]/page.tsx b/src/app/books/[bookId]/entity/[entityId]/page.tsx index 43033d8..fdd6014 100644 --- a/src/app/books/[bookId]/entity/[entityId]/page.tsx +++ b/src/app/books/[bookId]/entity/[entityId]/page.tsx @@ -1,5 +1,5 @@ import Link from "next/link"; -import { IconMapPin, IconPencil, IconTrash, IconX } from "@tabler/icons-react"; +import { IconHistory, IconMapPin, IconPencil, IconTrash, IconX } from "@tabler/icons-react"; import { deleteEntity } from "@/actions/entities"; import { deleteRelation } from "@/actions/relations"; import { ConfirmSubmit } from "@/components/confirm-submit"; @@ -64,6 +64,7 @@ export default async function EntityPage({ params }: { params: Promise<{ bookId: prisma.bookMap.findMany({ where: { bookId }, orderBy: { name: "asc" } }), ]); + const versionCount = await prisma.entityVersion.count({ where: { entityId: entity.id } }); const info = KIND_INFO[entity.kind]; const Icon = kindIcons[entity.kind]; const image = fileUrl(entity.imageFile); @@ -155,10 +156,16 @@ export default async function EntityPage({ params }: { params: Promise<{ bookId: {t("common.edit")} + {versionCount > 0 ? ( + + + {t("history.button", { n: versionCount })} + + ) : null}
- + {t("common.delete")} diff --git a/src/app/books/[bookId]/maps/page.tsx b/src/app/books/[bookId]/maps/page.tsx index a56f9da..9e7d097 100644 --- a/src/app/books/[bookId]/maps/page.tsx +++ b/src/app/books/[bookId]/maps/page.tsx @@ -8,8 +8,15 @@ import { requireBook } from "@/lib/session"; export const metadata = { title: "Kartor" }; -export default async function MapsPage({ params }: { params: Promise<{ bookId: string }> }) { +export default async function MapsPage({ + params, + searchParams, +}: { + params: Promise<{ bookId: string }>; + searchParams: Promise<{ error?: string }>; +}) { const { bookId } = await params; + const { error } = await searchParams; await requireBook(bookId); const { t } = await getT(); const maps = await prisma.bookMap.findMany({ @@ -22,6 +29,7 @@ export default async function MapsPage({ params }: { params: Promise<{ bookId: s <> + {error === "quota" ?
{t("quota.exceeded")}
: null}
{maps.length === 0 ? ( diff --git a/src/app/books/[bookId]/trash/page.tsx b/src/app/books/[bookId]/trash/page.tsx new file mode 100644 index 0000000..9ade80e --- /dev/null +++ b/src/app/books/[bookId]/trash/page.tsx @@ -0,0 +1,104 @@ +import Link from "next/link"; +import { IconArrowBackUp, IconTrash } from "@tabler/icons-react"; +import { emptyTrash, purgeTrash, restoreTrashEntity } from "@/actions/trash"; +import { ConfirmSubmit } from "@/components/confirm-submit"; +import { kindIcons } from "@/components/kind-icons"; +import { EmptyState, PageBody, PageHeader } from "@/components/page"; +import { getT } from "@/i18n/server"; +import { prisma } from "@/lib/db"; +import { KIND_INFO, parseKind } from "@/lib/kinds"; +import { requireBook } from "@/lib/session"; +import { TRASH_DAYS } from "@/lib/trash"; + +export const metadata = { title: "Papperskorg" }; + +export default async function TrashPage({ + params, + searchParams, +}: { + params: Promise<{ bookId: string }>; + searchParams: Promise<{ restore?: string }>; +}) { + const { bookId } = await params; + const { restore } = await searchParams; + const book = await requireBook(bookId); + const { t } = await getT(); + const items = await prisma.trashItem.findMany({ + where: { ownerId: book.ownerId, bookId, kind: "entity" }, + orderBy: { deletedAt: "desc" }, + }); + + return ( + <> + 0 ? ( + + + + + {t("trash.empty")} + + + ) : null + } + /> + + {restore === "failed" ?
{t("trash.restoreFailed")}
: null} +

{t("trash.intro", { days: TRASH_DAYS })}

+
+ {items.length === 0 ? ( +
+ {t("trash.emptyState")} +
+ ) : ( +
+ {items.map((item) => { + const kind = parseKind(item.detail); + const Icon = kind ? kindIcons[kind] : null; + const daysLeft = Math.max(0, TRASH_DAYS - Math.floor((Date.now() - item.deletedAt.getTime()) / 86_400_000)); + return ( +
+ {Icon && kind ? ( + + + + ) : null} +
+
{item.label}
+
+ {kind ? t(`kind.${kind}.one`) : ""} · {t("trash.deleted", { date: item.deletedAt.toISOString().slice(0, 10) })} ·{" "} + {t("trash.daysLeft", { n: daysLeft })} +
+
+
+ + + +
+
+ + + + {t("trash.purge")} + +
+
+ ); + })} +
+ )} +
+
+ + {t("common.back")} + +
+
+ + ); +} diff --git a/src/app/globals.css b/src/app/globals.css index 95fff43..48afa63 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -110,3 +110,53 @@ min-width: 9rem; vertical-align: top; } + +/* Kommandopalett (Ctrl+K) */ +.bm-palette-backdrop { + position: fixed; + inset: 0; + z-index: 2000; + background: rgba(15, 23, 42, 0.45); + display: flex; + align-items: flex-start; + justify-content: center; + padding: 12vh 1rem 1rem; +} + +.bm-palette { + width: 100%; + max-width: 40rem; + max-height: 70vh; + display: flex; + flex-direction: column; + overflow: hidden; + box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.3); +} + +.bm-palette .form-control-flush { + border: 0; + box-shadow: none; + padding-top: 0.9rem; + padding-bottom: 0.9rem; +} + +.bm-palette-list { + overflow-y: auto; + padding-bottom: 0.25rem; +} + +.bm-palette-item { + display: flex; + align-items: center; + gap: 0.75rem; + width: 100%; + padding: 0.5rem 1rem; + border: 0; + background: transparent; + color: inherit; + text-align: left; +} + +.bm-palette-item.active { + background: var(--tblr-primary-lt, rgba(32, 107, 196, 0.1)); +} diff --git a/src/auth.config.ts b/src/auth.config.ts index ba40fcc..aab0563 100644 --- a/src/auth.config.ts +++ b/src/auth.config.ts @@ -34,7 +34,8 @@ export default { : []), ], pages: { signIn: "/login" }, - session: { strategy: "jwt" }, + // Inloggningens livslängd i dagar (SESSION_DAYS), standard 14 + session: { strategy: "jwt", maxAge: (Number(process.env.SESSION_DAYS) || 14) * 24 * 60 * 60 }, callbacks: { authorized({ auth, request }) { if (request.nextUrl.pathname.startsWith("/login")) return true; diff --git a/src/components/command-palette.tsx b/src/components/command-palette.tsx new file mode 100644 index 0000000..c563cfd --- /dev/null +++ b/src/components/command-palette.tsx @@ -0,0 +1,211 @@ +"use client"; + +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { useRouter } from "next/navigation"; +import { IconCornerDownLeft, IconPlus, IconSearch, IconFileText } from "@tabler/icons-react"; +import type { EntityKind } from "@prisma/client"; +import { useT } from "@/i18n/client"; +import { kindIcons } from "./kind-icons"; + +type Command = { id: string; label: string; hint?: string; href: string; group: "entity" | "page" | "create"; kind?: EntityKind; code?: string | null }; +type SearchRow = { id: string; name: string; kind: EntityKind; code: string | null; summary: string }; + +/** + * Snabbsök och kommandopalett. Ctrl+K (Cmd+K på Mac) öppnar den. Sök poster i boken, hoppa till en sida eller + * skapa något nytt. Pilar väljer, Enter öppnar, Esc stänger. + */ +export function CommandPalette({ + bookId, + pages, + creates, +}: { + bookId?: string; + pages: { label: string; href: string }[]; + creates: { label: string; href: string }[]; +}) { + const t = useT(); + const router = useRouter(); + const [open, setOpen] = useState(false); + const [query, setQuery] = useState(""); + const [found, setFound] = useState([]); + const [loading, setLoading] = useState(false); + const [active, setActive] = useState(0); + const inputRef = useRef(null); + const listRef = useRef(null); + + const close = useCallback(() => { + setOpen(false); + setQuery(""); + setFound([]); + setActive(0); + }, []); + + // Ctrl/Cmd+K öppnar och stänger + useEffect(() => { + function onKey(event: KeyboardEvent) { + if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === "k") { + event.preventDefault(); + setOpen((value) => !value); + } + } + window.addEventListener("keydown", onKey); + return () => window.removeEventListener("keydown", onKey); + }, []); + + // Knappen i sidomenyn skickar en egen händelse + useEffect(() => { + const onOpen = () => setOpen(true); + window.addEventListener("bm:open-palette", onOpen); + return () => window.removeEventListener("bm:open-palette", onOpen); + }, []); + + useEffect(() => { + if (open) inputRef.current?.focus(); + }, [open]); + + // Sökning efter poster, med kort fördröjning medan man skriver + useEffect(() => { + if (!open || !bookId || query.trim().length < 2) { + setFound([]); + setLoading(false); + return; + } + setLoading(true); + const controller = new AbortController(); + const timer = setTimeout(async () => { + try { + const res = await fetch(`/api/books/${bookId}/search?q=${encodeURIComponent(query.trim())}`, { signal: controller.signal }); + if (res.ok) setFound(((await res.json()) as { results: SearchRow[] }).results); + } catch { + // avbruten eller nätverksfel: visa det som redan finns + } finally { + if (!controller.signal.aborted) setLoading(false); + } + }, 180); + return () => { + clearTimeout(timer); + controller.abort(); + }; + }, [query, open, bookId]); + + const commands = useMemo(() => { + const needle = query.trim().toLowerCase(); + const match = (label: string) => !needle || label.toLowerCase().includes(needle); + return [ + ...found.map((row): Command => ({ + id: `e-${row.id}`, + label: row.name, + hint: row.summary, + href: `/books/${bookId}/entity/${row.id}`, + group: "entity", + kind: row.kind, + code: row.code, + })), + ...pages.filter((p) => match(p.label)).map((p): Command => ({ id: `p-${p.href}`, label: p.label, href: p.href, group: "page" })), + ...creates.filter((c) => match(c.label)).map((c): Command => ({ id: `c-${c.href}`, label: c.label, href: c.href, group: "create" })), + ]; + }, [found, pages, creates, query, bookId]); + + useEffect(() => setActive(0), [query, found]); + + // Håll markerad rad synlig + useEffect(() => { + listRef.current?.querySelector(`[data-index="${active}"]`)?.scrollIntoView({ block: "nearest" }); + }, [active]); + + function go(command: Command | undefined) { + if (!command) return; + close(); + router.push(command.href); + } + + function onInputKey(event: React.KeyboardEvent) { + if (event.key === "ArrowDown") { + event.preventDefault(); + setActive((i) => Math.min(i + 1, commands.length - 1)); + } else if (event.key === "ArrowUp") { + event.preventDefault(); + setActive((i) => Math.max(i - 1, 0)); + } else if (event.key === "Enter") { + event.preventDefault(); + go(commands[active]); + } else if (event.key === "Escape") { + event.preventDefault(); + close(); + } + } + + if (!open) return null; + + const heading = (group: Command["group"]) => + group === "entity" ? t("palette.entities") : group === "page" ? t("palette.pages") : t("palette.create"); + + return ( +
+
e.stopPropagation()}> +
+ + + + setQuery(e.target.value)} + onKeyDown={onInputKey} + autoComplete="off" + spellCheck={false} + /> +
+ +
+ {commands.length === 0 ? ( +
{loading ? t("common.loading") : t("palette.empty")}
+ ) : ( + commands.map((command, index) => { + const Icon = command.kind ? kindIcons[command.kind] : command.group === "create" ? IconPlus : IconFileText; + const showHeading = index === 0 || commands[index - 1].group !== command.group; + return ( +
+ {showHeading ?
{heading(command.group)}
: null} + +
+ ); + }) + )} +
+ +
+ {t("palette.hint")} + +
+
+
+ ); +} + +/** Knapp som öppnar paletten. Ligger i sidomenyn. */ +export function PaletteButton() { + const t = useT(); + return ( + + ); +} diff --git a/src/components/entity-form.tsx b/src/components/entity-form.tsx index 9cd4d00..6d338e5 100644 --- a/src/components/entity-form.tsx +++ b/src/components/entity-form.tsx @@ -109,7 +109,7 @@ export function EntityForm({ t: TFunction; }) { const data = (entity?.data ?? {}) as Record; - const image = fileUrl(entity?.imageFile); + const image = fileUrl(entity?.imageFile, "thumb"); return (
diff --git a/src/components/shell.tsx b/src/components/shell.tsx index ef1e6eb..6f783a9 100644 --- a/src/components/shell.tsx +++ b/src/components/shell.tsx @@ -9,7 +9,9 @@ import { IconListDetails, IconLogout, IconMap2, + IconServerCog, IconSettings, + IconTrash, IconTemplate, IconBooks, } from "@tabler/icons-react"; @@ -17,14 +19,17 @@ import type { ReactNode } from "react"; import { signOut } from "@/auth"; import { setLocale } from "@/actions/settings"; import { getT } from "@/i18n/server"; +import { isAdminUser } from "@/lib/admin"; +import { APP_VERSION_LABEL } from "@/lib/version"; import { LOCALES } from "@/i18n/core"; import { KINDS } from "@/lib/kinds"; import { kindIcons } from "./kind-icons"; +import { CommandPalette, PaletteButton } from "./command-palette"; import { NavLink } from "./nav-link"; import { ThemeToggle } from "./theme-toggle"; type ShellProps = { - user: { name?: string | null; email?: string | null }; + user: { id: string; name?: string | null; email?: string | null }; book?: { id: string; title: string }; children: ReactNode; }; @@ -32,6 +37,28 @@ type ShellProps = { export async function Shell({ user, book, children }: ShellProps) { const { t, locale } = await getT(); const base = book ? `/books/${book.id}` : ""; + const admin = await isAdminUser(user.id, user.email ?? null); + + // Sidor och "skapa ny" för kommandopaletten (Ctrl+K) + const pages = [ + ...(book + ? [ + { label: t("nav.books"), href: "/" }, + { label: t("nav.overview"), href: base }, + ...KINDS.map((k) => ({ label: t(`kind.${k.kind}.other`), href: `${base}/e/${k.slug}` })), + { label: t("nav.relations"), href: `${base}/relations` }, + { label: t("nav.schedules"), href: `${base}/schedules` }, + { label: t("nav.maps"), href: `${base}/maps` }, + { label: t("nav.names"), href: `${base}/names` }, + { label: t("nav.idRegister"), href: `${base}/register` }, + { label: t("nav.templates"), href: `${base}/templates` }, + { label: t("nav.trash"), href: `${base}/trash` }, + { label: t("nav.settings"), href: `${base}/settings` }, + ] + : [{ label: t("nav.books"), href: "/" }]), + ...(admin ? [{ label: t("nav.admin"), href: "/admin" }] : []), + ]; + const creates = book ? KINDS.map((k) => ({ label: t(`kind.${k.kind}.new`), href: `${base}/e/${k.slug}/new` })) : []; return (
@@ -56,6 +83,9 @@ export async function Shell({ user, book, children }: ShellProps) {