From 2447537652b73f797bb661d3ddd4227b110d9eba Mon Sep 17 00:00:00 2001 From: Eugenius Naumenko Date: Sat, 10 Oct 2026 20:27:55 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"Adminbereich=20mit=20Rollen=20und=20N?= =?UTF-8?q?utzerauswertung=20erg=C3=A4nzen"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e432943ea76a13e8a4b0348f464e820ab29bf9d9. --- README.md | 38 +------- apps/api/internal/domain/models.go | 25 ----- apps/api/internal/httpapi/admin.go | 39 -------- apps/api/internal/httpapi/admin_test.go | 84 ---------------- apps/api/internal/httpapi/middleware.go | 17 ---- apps/api/internal/httpapi/server.go | 14 +-- apps/api/internal/store/admin.go | 71 -------------- apps/api/internal/store/store.go | 17 ++-- apps/web/src/api/admin.ts | 11 --- apps/web/src/api/auth.ts | 6 +- apps/web/src/api/types.ts | 25 ----- apps/web/src/app/App.tsx | 65 +------------ apps/web/src/app/styles.css | 124 ------------------------ apps/web/src/pages/AdminPage.tsx | 116 ---------------------- 14 files changed, 18 insertions(+), 634 deletions(-) delete mode 100644 apps/api/internal/httpapi/admin.go delete mode 100644 apps/api/internal/httpapi/admin_test.go delete mode 100644 apps/api/internal/store/admin.go delete mode 100644 apps/web/src/api/admin.ts delete mode 100644 apps/web/src/pages/AdminPage.tsx diff --git a/README.md b/README.md index 0c061eb..762ae6a 100644 --- a/README.md +++ b/README.md @@ -13,42 +13,6 @@ Sprachlern-App für Ausspracheübungen auf A1-Niveau. Die Web-App nimmt Sprache Weitere Übungstypen, ein `evaluate_attempt`-Flowise-Task und ein langfristiges Fähigkeitsmodell pro Wort sind noch nicht implementiert. -## Adminbereich - -Die App besitzt einen geschützten Adminbereich unter dem Menüpunkt **Adminbereich**. Er zeigt die Zahl aller Konten, aktive Nutzer der letzten sieben Tage (mindestens ein Sprechversuch), alle Sprechversuche, die Zahl gespeicherter Flowise-Übungen und die durchschnittliche Gesamtbewertung. Die Nutzerliste kann nach E-Mail durchsucht werden, zeigt Registrierungsdatum, Rolle und aggregierte Lernaktivität und lädt höchstens 25 Konten pro Seite. Audio und vollständige Versuchstexte werden dort nicht angezeigt. - -Adminrechte werden **bei jedem Admin-API-Aufruf** aus PostgreSQL gelesen. Ein Lernender bekommt für `GET /admin/overview` und `GET /admin/users` HTTP 403; ohne Anmeldung ist es HTTP 401. Eine versteckte Web-Seite allein wäre kein Zugriffsschutz. Öffentliche Registrierung erstellt ausschließlich Konten mit der Rolle `learner`. Die Rolle wird beim Start der API auch für bestehende Datenbanken als neue Spalte angelegt. Wenn Debug aktiviert ist, sind die Debug-Endpunkte ebenfalls nur für Admins zugänglich. - -### Erstes Admin-Konto einrichten - -1. Ein eigenes Konto über die normale Registrierung erstellen. Ein bereits vorhandenes eigenes Konto kann ebenfalls verwendet werden. -2. Auf dem VPS mit PostgreSQL verbinden (Datenbankname und Nutzer aus der `.env` verwenden): - - ```bash - docker compose exec speech-postgres psql -U speech -d speech - ``` - -3. **Nur das eigene Konto** anhand der E-Mail-Adresse zum Admin machen: - - ```sql - UPDATE users SET role = 'admin' WHERE email = 'eigene-adresse@beispiel.de'; - ``` - -4. Die Web-App neu laden. Die API liefert die aktuelle Rolle über `GET /me`; danach erscheint der Adminbereich in der Navigation. - -Es gibt bewusst keinen öffentlichen Endpunkt, über den Nutzer sich selbst Adminrechte geben können. Für spätere Teamverwaltung braucht es einen gesonderten Ablauf mit Änderungsprotokoll und stärkeren Anmeldeschutzmaßnahmen. - -### Vorbereitung für ein Kaufprodukt - -Der Adminbereich ist derzeit eine **Betriebs- und Nutzerübersicht**. Er zeigt keine Umsätze oder Abonnements, weil die App noch keinen Produktkatalog, Zahlungsanbieter oder Kaufberechtigungen besitzt. Für den Verkauf sind als nächste Ausbaustufen sinnvoll: - -1. Produkte und Tarife mit Preis, Laufzeit und enthaltenen Lernfunktionen definieren. -2. Einen Zahlungsanbieter anbinden und signierte Webhooks verarbeiten. Zahlungen und Rückerstattungen müssen nachvollziehbar gespeichert werden. -3. Den Zugang zu bezahlten Funktionen über serverseitig geprüfte Berechtigungen steuern. -4. Im Adminbereich Bestellungen, Zahlungsstatus, Supportfälle und einen Änderungsverlauf für Adminaktionen anzeigen. - -Solange diese Teile fehlen, bleibt die Lern-App für registrierte Nutzer unabhängig von einem Kauf zugänglich. - ## Architektur und Datenfluss ```text @@ -201,7 +165,7 @@ cd ../web && npm run build ## Debug -Debug-Endpunkte und der Navigationspunkt **Debug** lassen sich über `.env` aktivieren. Sie sind nur für Admins zugänglich: +Debug-Endpunkte und der Navigationspunkt **Debug** lassen sich über `.env` aktivieren: ```env DEBUG_ENABLED=true diff --git a/apps/api/internal/domain/models.go b/apps/api/internal/domain/models.go index 9996a22..62663a9 100644 --- a/apps/api/internal/domain/models.go +++ b/apps/api/internal/domain/models.go @@ -6,34 +6,9 @@ type User struct { ID string `json:"id"` Email string `json:"email"` UILanguage string `json:"ui_language"` - Role string `json:"role"` CreatedAt time.Time `json:"created_at"` } -type AdminOverview struct { - UsersTotal int `json:"users_total"` - UsersActive7Days int `json:"users_active_7_days"` - AttemptsTotal int `json:"attempts_total"` - ExercisesGenerated int `json:"exercises_generated"` - AverageScore float64 `json:"average_score"` -} - -type AdminUser struct { - ID string `json:"id"` - Email string `json:"email"` - Role string `json:"role"` - CreatedAt time.Time `json:"created_at"` - Attempts int `json:"attempts"` - AverageScore float64 `json:"average_score"` - LastAttempt *time.Time `json:"last_attempt,omitempty"` -} - -type AdminUserPage struct { - Users []AdminUser `json:"users"` - Total int `json:"total"` - Page int `json:"page"` -} - type LearnerProfile struct { ID string `json:"id"` UserID string `json:"user_id"` diff --git a/apps/api/internal/httpapi/admin.go b/apps/api/internal/httpapi/admin.go deleted file mode 100644 index eded895..0000000 --- a/apps/api/internal/httpapi/admin.go +++ /dev/null @@ -1,39 +0,0 @@ -package httpapi - -import ( - "net/http" - "strconv" - "strings" -) - -func (s *Server) adminOverview(w http.ResponseWriter, r *http.Request) { - overview, err := s.store.AdminOverview(r.Context()) - if err != nil { - writeError(w, http.StatusInternalServerError, err) - return - } - writeJSON(w, http.StatusOK, overview) -} - -func (s *Server) adminUsers(w http.ResponseWriter, r *http.Request) { - search := strings.TrimSpace(r.URL.Query().Get("search")) - if len(search) > 100 { - writeError(w, http.StatusBadRequest, nil) - return - } - page := 1 - if value := r.URL.Query().Get("page"); value != "" { - parsed, err := strconv.Atoi(value) - if err != nil || parsed < 1 || parsed > 100000 { - writeError(w, http.StatusBadRequest, nil) - return - } - page = parsed - } - users, err := s.store.AdminUsers(r.Context(), search, page) - if err != nil { - writeError(w, http.StatusInternalServerError, err) - return - } - writeJSON(w, http.StatusOK, users) -} diff --git a/apps/api/internal/httpapi/admin_test.go b/apps/api/internal/httpapi/admin_test.go deleted file mode 100644 index c39cc5a..0000000 --- a/apps/api/internal/httpapi/admin_test.go +++ /dev/null @@ -1,84 +0,0 @@ -package httpapi - -import ( - "context" - "io" - "log/slog" - "net/http" - "net/http/httptest" - "testing" - - "speech-learning-api/internal/config" - "speech-learning-api/internal/domain" - "speech-learning-api/internal/services" -) - -type adminTestStore struct { - DataStore - role string -} - -func (s *adminTestStore) GetUser(_ context.Context, id string) (domain.User, error) { - return domain.User{ID: id, Role: s.role}, nil -} - -func (s *adminTestStore) AdminOverview(_ context.Context) (domain.AdminOverview, error) { - return domain.AdminOverview{UsersTotal: 3}, nil -} - -func (s *adminTestStore) AdminUsers(_ context.Context, _ string, page int) (domain.AdminUserPage, error) { - return domain.AdminUserPage{Page: page}, nil -} - -func (s *adminTestStore) DebugStatus(_ context.Context) domain.DebugDBStatus { - return domain.DebugDBStatus{OK: true} -} - -func TestAdminRoutesRequireCurrentAdminRole(t *testing.T) { - data := &adminTestStore{role: "learner"} - auth := services.NewAuthService(nil, "test-secret") - server := &Server{ - cfg: config.Config{DebugEnabled: true}, - store: data, auth: auth, - logger: slog.New(slog.NewTextHandler(io.Discard, nil)), - } - token, err := auth.IssueToken("usr_1") - if err != nil { - t.Fatal(err) - } - for _, testCase := range []struct { - path string - }{ - {"/admin/overview"}, - {"/admin/users"}, - {"/debug/status"}, - } { - t.Run(testCase.path, func(t *testing.T) { - handler := server.Routes() - request := func(withToken bool) int { - req := httptest.NewRequest(http.MethodGet, testCase.path, nil) - if withToken { - req.Header.Set("Authorization", "Bearer "+token) - } - recorder := httptest.NewRecorder() - handler.ServeHTTP(recorder, req) - return recorder.Code - } - data.role = "learner" - if got := request(false); got != http.StatusUnauthorized { - t.Fatalf("anonymous status = %d, want 401", got) - } - if got := request(true); got != http.StatusForbidden { - t.Fatalf("learner status = %d, want 403", got) - } - data.role = "admin" - if got := request(true); got != http.StatusOK { - t.Fatalf("admin status = %d, want 200", got) - } - data.role = "learner" - if got := request(true); got != http.StatusForbidden { - t.Fatalf("demoted admin status = %d, want 403", got) - } - }) - } -} diff --git a/apps/api/internal/httpapi/middleware.go b/apps/api/internal/httpapi/middleware.go index f445392..a2cf2f1 100644 --- a/apps/api/internal/httpapi/middleware.go +++ b/apps/api/internal/httpapi/middleware.go @@ -125,23 +125,6 @@ func (s *Server) requireAuth(next http.Handler) http.Handler { }) } -// Admin rights are read from PostgreSQL for every request. A previously -// issued token does not preserve privileges after an account is demoted. -func (s *Server) requireAdmin(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user, err := s.store.GetUser(r.Context(), currentUserID(r)) - if err != nil { - writeError(w, http.StatusInternalServerError, err) - return - } - if user.Role != "admin" { - writeError(w, http.StatusForbidden, nil) - return - } - next.ServeHTTP(w, r) - }) -} - func currentUserID(r *http.Request) string { value, _ := r.Context().Value(userIDKey).(string) return value diff --git a/apps/api/internal/httpapi/server.go b/apps/api/internal/httpapi/server.go index 0b1e601..9940e2a 100644 --- a/apps/api/internal/httpapi/server.go +++ b/apps/api/internal/httpapi/server.go @@ -26,8 +26,6 @@ type DataStore interface { GetExercise(ctx context.Context, id, userID string) (domain.Exercise, error) SaveAttempt(ctx context.Context, attempt domain.Attempt) (domain.Attempt, error) Progress(ctx context.Context, userID string, limit int) (domain.ProgressSummary, error) - AdminOverview(ctx context.Context) (domain.AdminOverview, error) - AdminUsers(ctx context.Context, search string, page int) (domain.AdminUserPage, error) CreateConversationSession(ctx context.Context, userID, targetLanguage, cefrLevel string) (domain.ConversationSession, error) SaveConversationTurn(ctx context.Context, turn domain.ConversationTurn) (domain.ConversationTurn, error) DebugStatus(ctx context.Context) domain.DebugDBStatus @@ -64,14 +62,12 @@ func (s *Server) Routes() http.Handler { mux.Handle("POST /practice/attempts", s.requireAuth(http.HandlerFunc(s.createAttempt))) mux.Handle("POST /conversation/start", s.requireAuth(http.HandlerFunc(s.startConversation))) mux.Handle("POST /conversation/{id}/turn", s.requireAuth(http.HandlerFunc(s.conversationTurn))) - mux.Handle("GET /admin/overview", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.adminOverview)))) - mux.Handle("GET /admin/users", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.adminUsers)))) if s.cfg.DebugEnabled { - mux.Handle("GET /debug/status", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugStatus)))) - mux.Handle("GET /debug/db", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugDB)))) - mux.Handle("GET /debug/flowise", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugFlowise)))) - mux.Handle("GET /debug/azure", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugAzure)))) - mux.Handle("GET /debug/runtime", s.requireAuth(s.requireAdmin(http.HandlerFunc(s.debugRuntime)))) + mux.Handle("GET /debug/status", s.requireAuth(http.HandlerFunc(s.debugStatus))) + mux.Handle("GET /debug/db", s.requireAuth(http.HandlerFunc(s.debugDB))) + mux.Handle("GET /debug/flowise", s.requireAuth(http.HandlerFunc(s.debugFlowise))) + mux.Handle("GET /debug/azure", s.requireAuth(http.HandlerFunc(s.debugAzure))) + mux.Handle("GET /debug/runtime", s.requireAuth(http.HandlerFunc(s.debugRuntime))) } return s.requestID(s.requestLogging(s.cors(mux))) diff --git a/apps/api/internal/store/admin.go b/apps/api/internal/store/admin.go deleted file mode 100644 index ada573c..0000000 --- a/apps/api/internal/store/admin.go +++ /dev/null @@ -1,71 +0,0 @@ -package store - -import ( - "context" - "database/sql" - "strings" - - "speech-learning-api/internal/domain" -) - -func (s *PostgresStore) AdminOverview(ctx context.Context) (domain.AdminOverview, error) { - var overview domain.AdminOverview - err := s.db.QueryRowContext(ctx, ` - SELECT - (SELECT COUNT(*) FROM users), - (SELECT COUNT(DISTINCT user_id) FROM attempts WHERE created_at >= now() - interval '7 days'), - (SELECT COUNT(*) FROM attempts), - (SELECT COUNT(*) FROM exercises WHERE source = 'flowise'), - (SELECT COALESCE(AVG(overall_score), 0) FROM attempts) - `).Scan(&overview.UsersTotal, &overview.UsersActive7Days, &overview.AttemptsTotal, - &overview.ExercisesGenerated, &overview.AverageScore) - return overview, err -} - -func (s *PostgresStore) AdminUsers(ctx context.Context, search string, page int) (domain.AdminUserPage, error) { - if page < 1 { - page = 1 - } - search = strings.TrimSpace(search) - result := domain.AdminUserPage{Users: []domain.AdminUser{}, Page: page} - if err := s.db.QueryRowContext(ctx, ` - SELECT COUNT(*) FROM users WHERE ($1 = '' OR email ILIKE '%' || $1 || '%') - `, search).Scan(&result.Total); err != nil { - return domain.AdminUserPage{}, err - } - rows, err := s.db.QueryContext(ctx, ` - WITH selected AS ( - SELECT id, email, role, created_at - FROM users - WHERE ($1 = '' OR email ILIKE '%' || $1 || '%') - ORDER BY created_at DESC, id DESC - LIMIT 25 OFFSET $2 - ) - SELECT u.id, u.email, u.role, u.created_at, - a.attempts, a.average_score, a.last_attempt - FROM selected u - LEFT JOIN LATERAL ( - SELECT COUNT(*) AS attempts, COALESCE(AVG(overall_score), 0) AS average_score, - MAX(created_at) AS last_attempt - FROM attempts WHERE user_id = u.id - ) a ON true - ORDER BY u.created_at DESC, u.id DESC - `, search, (page-1)*25) - if err != nil { - return domain.AdminUserPage{}, err - } - defer rows.Close() - for rows.Next() { - var user domain.AdminUser - var last sql.NullTime - if err := rows.Scan(&user.ID, &user.Email, &user.Role, &user.CreatedAt, - &user.Attempts, &user.AverageScore, &last); err != nil { - return domain.AdminUserPage{}, err - } - if last.Valid { - user.LastAttempt = &last.Time - } - result.Users = append(result.Users, user) - } - return result, rows.Err() -} diff --git a/apps/api/internal/store/store.go b/apps/api/internal/store/store.go index 904dfa7..7f54269 100644 --- a/apps/api/internal/store/store.go +++ b/apps/api/internal/store/store.go @@ -142,9 +142,9 @@ func (s *PostgresStore) CreateUser(ctx context.Context, email, passwordHash, uiL row := s.db.QueryRowContext(ctx, ` INSERT INTO users (id, email, password_hash, ui_language) VALUES ($1, $2, $3, $4) - RETURNING id, email, ui_language, role, created_at + RETURNING id, email, ui_language, created_at `, user.ID, user.Email, passwordHash, uiLanguage) - if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.Role, &user.CreatedAt); err != nil { + if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.CreatedAt); err != nil { return domain.User{}, err } return user, nil @@ -154,11 +154,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string var user domain.User var hash string row := s.db.QueryRowContext(ctx, ` - SELECT id, email, password_hash, ui_language, role, created_at + SELECT id, email, password_hash, ui_language, created_at FROM users WHERE email = $1 `, strings.ToLower(strings.TrimSpace(email))) - if err := row.Scan(&user.ID, &user.Email, &hash, &user.UILanguage, &user.Role, &user.CreatedAt); err != nil { + if err := row.Scan(&user.ID, &user.Email, &hash, &user.UILanguage, &user.CreatedAt); err != nil { if errors.Is(err, sql.ErrNoRows) { return domain.User{}, "", ErrNotFound } @@ -170,11 +170,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string func (s *PostgresStore) GetUser(ctx context.Context, id string) (domain.User, error) { var user domain.User row := s.db.QueryRowContext(ctx, ` - SELECT id, email, ui_language, role, created_at + SELECT id, email, ui_language, created_at FROM users WHERE id = $1 `, id) - if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.Role, &user.CreatedAt); err != nil { + if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.CreatedAt); err != nil { if errors.Is(err, sql.ErrNoRows) { return domain.User{}, ErrNotFound } @@ -558,11 +558,6 @@ CREATE TABLE IF NOT EXISTS users ( created_at TIMESTAMPTZ NOT NULL DEFAULT now() ); --- Existing installations receive the role on startup; public registration --- continues to create only learner accounts. -ALTER TABLE users ADD COLUMN IF NOT EXISTS role TEXT NOT NULL DEFAULT 'learner' - CHECK (role IN ('learner', 'admin')); - CREATE TABLE IF NOT EXISTS learner_profiles ( id TEXT PRIMARY KEY, user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE, diff --git a/apps/web/src/api/admin.ts b/apps/web/src/api/admin.ts deleted file mode 100644 index 66b99bf..0000000 --- a/apps/web/src/api/admin.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { request } from './client'; -import type { AdminOverview, AdminUserPage } from './types'; - -export function fetchAdminOverview() { - return request('/admin/overview'); -} - -export function fetchAdminUsers(search: string, page: number) { - const params = new URLSearchParams({ search, page: String(page) }); - return request(`/admin/users?${params}`); -} diff --git a/apps/web/src/api/auth.ts b/apps/web/src/api/auth.ts index 3d4bc71..a4d920a 100644 --- a/apps/web/src/api/auth.ts +++ b/apps/web/src/api/auth.ts @@ -1,9 +1,5 @@ import { request, setToken } from './client'; -import type { AuthResult, LearnerProfile, User } from './types'; - -export function fetchMe() { - return request<{ user: User; profile: LearnerProfile }>('/me'); -} +import type { AuthResult } from './types'; export async function register(email: string, password: string) { const result = await request('/auth/register', { diff --git a/apps/web/src/api/types.ts b/apps/web/src/api/types.ts index a9fa995..160c963 100644 --- a/apps/web/src/api/types.ts +++ b/apps/web/src/api/types.ts @@ -2,34 +2,9 @@ export type User = { id: string; email: string; ui_language: string; - role: 'learner' | 'admin'; created_at: string; }; -export type AdminOverview = { - users_total: number; - users_active_7_days: number; - attempts_total: number; - exercises_generated: number; - average_score: number; -}; - -export type AdminUser = { - id: string; - email: string; - role: 'learner' | 'admin'; - created_at: string; - attempts: number; - average_score: number; - last_attempt?: string; -}; - -export type AdminUserPage = { - users: AdminUser[]; - total: number; - page: number; -}; - export type LearnerProfile = { id: string; user_id: string; diff --git a/apps/web/src/app/App.tsx b/apps/web/src/app/App.tsx index 8bf3994..ec24906 100644 --- a/apps/web/src/app/App.tsx +++ b/apps/web/src/app/App.tsx @@ -1,10 +1,8 @@ -import { BookOpen, Bug, ChartNoAxesColumnIncreasing, LogOut, Mic, MessageCircle, Shield } from 'lucide-react'; +import { BookOpen, Bug, ChartNoAxesColumnIncreasing, LogOut, Mic, MessageCircle } from 'lucide-react'; import { useEffect, useState } from 'react'; -import { fetchMe } from '../api/auth'; -import { ApiError, clearToken, getToken } from '../api/client'; +import { clearToken, getToken } from '../api/client'; import { fetchDebugStatus } from '../api/debug'; -import type { Exercise, Lesson, User } from '../api/types'; -import { AdminPage } from '../pages/AdminPage'; +import type { Exercise, Lesson } from '../api/types'; import { DashboardPage } from '../pages/DashboardPage'; import { LoginPage } from '../pages/LoginPage'; import { RegisterPage } from '../pages/RegisterPage'; @@ -17,38 +15,11 @@ import { useHashRoute } from './useHashRoute'; export function App() { const [route, setRoute] = useHashRoute(getToken() ? 'dashboard' : 'login'); const [debugAvailable, setDebugAvailable] = useState(false); - const [user, setUser] = useState(null); - const [authError, setAuthError] = useState(''); - const [authRevision, setAuthRevision] = useState(0); const [practiceSelection, setPracticeSelection] = useState<{ lesson: Lesson; exercise: Exercise } | null>(null); const authed = Boolean(getToken()); useEffect(() => { if (!authed) { - setUser(null); - return; - } - let cancelled = false; - setAuthError(''); - fetchMe().then(({ user: currentUser }) => { - if (!cancelled) { - setUser(currentUser); - setAuthError(''); - } - }).catch((error) => { - if (cancelled) return; - if (error instanceof ApiError && error.status === 401) { - clearToken(); - setRoute('login'); - } else { - setAuthError(error instanceof Error ? error.message : 'Konto konnte nicht geladen werden.'); - } - }); - return () => { cancelled = true; }; - }, [authed, authRevision]); - - useEffect(() => { - if (!authed || user?.role !== 'admin') { setDebugAvailable(false); return; } @@ -63,21 +34,18 @@ export function App() { return () => { cancelled = true; }; - }, [authed, user?.role]); + }, [authed]); useEffect(() => { if (route !== 'practice') setPracticeSelection(null); }, [route]); function handleAuthed() { - setUser(null); - setAuthRevision((value) => value + 1); setRoute('dashboard'); } function logout() { clearToken(); - setUser(null); setPracticeSelection(null); setRoute('login'); } @@ -99,23 +67,6 @@ export function App() { ); } - if (!user) { - return ( -
-
-

Konto wird geladen

- {authError ? ( - <> -

{authError}

- - - - ) :

Bitte einen Moment warten.

} -
-
- ); - } - return (
); diff --git a/apps/web/src/app/styles.css b/apps/web/src/app/styles.css index fde66df..62b3bd9 100644 --- a/apps/web/src/app/styles.css +++ b/apps/web/src/app/styles.css @@ -340,118 +340,6 @@ input:focus { gap: 14px; } -.admin-view { - max-width: 1280px; -} - -.admin-metrics { - display: grid; - grid-template-columns: repeat(auto-fit, minmax(175px, 1fr)); - gap: 14px; -} - -.admin-users, -.admin-product { - display: grid; - gap: 18px; -} - -.admin-section-head { - display: flex; - justify-content: space-between; - align-items: flex-start; - gap: 20px; -} - -.admin-section-head h2, -.admin-product h2 { - margin: 0; -} - -.admin-section-head p, -.admin-product p { - margin-bottom: 0; -} - -.admin-count, -.admin-role { - display: inline-flex; - padding: 5px 10px; - border-radius: 999px; - color: #0e5f47; - background: #e5f4ec; - font-size: 0.82rem; - font-weight: 800; - white-space: nowrap; -} - -.admin-role-staff { - color: #4a397f; - background: #eeeafb; -} - -.admin-search { - max-width: 520px; -} - -.admin-search .action-row { - flex-wrap: nowrap; -} - -.admin-table-wrap { - overflow-x: auto; -} - -.admin-table { - width: 100%; - min-width: 780px; - border-collapse: collapse; - text-align: left; -} - -.admin-table th, -.admin-table td { - padding: 13px 10px; - border-bottom: 1px solid #e2e7e4; -} - -.admin-table th { - color: #526158; - font-size: 0.82rem; -} - -.admin-table td small { - display: block; - margin-top: 3px; - color: #657269; -} - -.admin-empty { - padding: 15px 10px; -} - -.admin-pagination { - display: flex; - align-items: center; - justify-content: flex-end; - gap: 12px; -} - -.admin-next-steps { - display: flex; - flex-wrap: wrap; - gap: 8px; -} - -.admin-next-steps span { - padding: 8px 10px; - border-radius: 8px; - background: #f1f4f2; - color: #526158; - font-weight: 700; - font-size: 0.85rem; -} - .debug-card { display: grid; align-content: start; @@ -659,16 +547,4 @@ input:focus { .target-text { font-size: 1.3rem; } - - .admin-section-head { - display: grid; - } - - .admin-search .action-row { - flex-wrap: wrap; - } - - .admin-pagination { - justify-content: space-between; - } } diff --git a/apps/web/src/pages/AdminPage.tsx b/apps/web/src/pages/AdminPage.tsx deleted file mode 100644 index 690cf52..0000000 --- a/apps/web/src/pages/AdminPage.tsx +++ /dev/null @@ -1,116 +0,0 @@ -import { useEffect, useState, type FormEvent } from 'react'; -import { fetchAdminOverview, fetchAdminUsers } from '../api/admin'; -import type { AdminOverview, AdminUserPage } from '../api/types'; - -function formatDate(value?: string) { - return value ? new Date(value).toLocaleDateString('de-DE') : 'Noch kein Versuch'; -} - -export function AdminPage() { - const [overview, setOverview] = useState(null); - const [users, setUsers] = useState(null); - const [searchInput, setSearchInput] = useState(''); - const [search, setSearch] = useState(''); - const [page, setPage] = useState(1); - const [overviewError, setOverviewError] = useState(''); - const [usersError, setUsersError] = useState(''); - - useEffect(() => { - let cancelled = false; - fetchAdminOverview() - .then((data) => { if (!cancelled) setOverview(data); }) - .catch((error) => { if (!cancelled) setOverviewError(error instanceof Error ? error.message : 'Kennzahlen konnten nicht geladen werden.'); }); - return () => { cancelled = true; }; - }, []); - - useEffect(() => { - let cancelled = false; - fetchAdminUsers(search, page) - .then((data) => { if (!cancelled) { setUsers(data); setUsersError(''); } }) - .catch((error) => { if (!cancelled) setUsersError(error instanceof Error ? error.message : 'Nutzer konnten nicht geladen werden.'); }); - return () => { cancelled = true; }; - }, [search, page]); - - function submitSearch(event: FormEvent) { - event.preventDefault(); - setPage(1); - setSearch(searchInput.trim()); - } - - return ( -
-
-
-

Verwaltung

-

Adminbereich

-

Nutzer und Lernaktivität im Blick.

-
-
- - {overviewError &&

{overviewError}

} -
-
Nutzer gesamt{overview?.users_total ?? '–'}
-
Aktiv in 7 Tagen{overview?.users_active_7_days ?? '–'}
-
Sprechversuche{overview?.attempts_total ?? '–'}
-
Flowise-Übungen{overview?.exercises_generated ?? '–'}
-
Ø Bewertung{overview ? Math.round(overview.average_score) : '–'}
-
- -
-
-
-

Nutzer

-

Konten und Lernaktivität. Suche nach E-Mail-Adresse.

-
- {users?.total ?? '–'} Treffer -
-
- -
- setSearchInput(event.target.value)} placeholder="name@beispiel.de" /> - -
-
- {usersError &&

{usersError}

} -
- - - - {(users?.users ?? []).map((user) => ( - - - - - - - - - ))} - -
NutzerRolleRegistriertVersucheØ BewertungLetzter Versuch
{user.email}{user.id}{user.role === 'admin' ? 'Admin' : 'Lernende'}{formatDate(user.created_at)}{user.attempts}{user.attempts > 0 ? Math.round(user.average_score) : '–'}{formatDate(user.last_attempt)}
- {users && users.users.length === 0 &&

Keine passenden Nutzer gefunden.

} - {!users && !usersError &&

Lade Nutzer...

} -
-
- - Seite {page} von {Math.max(1, Math.ceil((users?.total ?? 0) / 25))} - -
-
- -
-
-

Produktbetrieb

-

Verkauf und Zugänge

-

Tarife, Zahlungen und Berechtigungen für gekaufte Inhalte sind noch nicht angeschlossen. Deshalb zeigt dieser Bereich keine erfundenen Umsatz- oder Abozahlen.

-
-
- Als Nächstes: Produktkatalog - Dann: Zahlungsanbieter und Webhooks - Danach: Zugangsrechte pro Kauf -
-
-
- ); -}