From 24f877e50bac81368488316723781774be6c79ca Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Wed, 6 Nov 2024 23:34:37 +0100
Subject: [PATCH 01/11] Initial admin dashboard layout

---
 .../src/components/navigation/UserMenu.jsx    |  39 +++-
 .../settings/admin/AdminDashboard.jsx         | 182 ++++++++++++++++++
 2 files changed, 220 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/settings/admin/AdminDashboard.jsx

diff --git a/frontend/src/components/navigation/UserMenu.jsx b/frontend/src/components/navigation/UserMenu.jsx
index c5d0e68..0002eb0 100644
--- a/frontend/src/components/navigation/UserMenu.jsx
+++ b/frontend/src/components/navigation/UserMenu.jsx
@@ -8,12 +8,19 @@ import {
   Text,
   Divider,
 } from '@mantine/core';
-import { IconUser, IconLogout, IconSettings } from '@tabler/icons-react';
+import {
+  IconUser,
+  IconUsers,
+  IconLogout,
+  IconSettings,
+} from '@tabler/icons-react';
 import { useAuth } from '../../contexts/AuthContext';
 import AccountSettings from '../settings/account/AccountSettings';
+import AdminDashboard from '../settings/admin/AdminDashboard';
 
 const UserMenu = () => {
   const [accountSettingsOpened, setAccountSettingsOpened] = useState(false);
+  const [adminDashboardOpened, setAdminDashboardOpened] = useState(false);
   const [opened, setOpened] = useState(false);
   const { user, logout } = useAuth();
 
@@ -81,6 +88,31 @@ const UserMenu = () => {
               </Group>
             </UnstyledButton>
 
+            {user.role === 'admin' && (
+              <UnstyledButton
+                onClick={() => {
+                  setAdminDashboardOpened(true);
+                  setOpened(false);
+                }}
+                px="sm"
+                py="xs"
+                style={(theme) => ({
+                  borderRadius: theme.radius.sm,
+                  '&:hover': {
+                    backgroundColor:
+                      theme.colorScheme === 'dark'
+                        ? theme.colors.dark[5]
+                        : theme.colors.gray[0],
+                  },
+                })}
+              >
+                <Group>
+                  <IconUsers size={16} />
+                  <Text size="sm">Admin Dashboard</Text>
+                </Group>
+              </UnstyledButton>
+            )}
+
             <UnstyledButton
               onClick={handleLogout}
               px="sm"
@@ -111,6 +143,11 @@ const UserMenu = () => {
         opened={accountSettingsOpened}
         onClose={() => setAccountSettingsOpened(false)}
       />
+
+      <AdminDashboard
+        opened={adminDashboardOpened}
+        onClose={() => setAdminDashboardOpened(false)}
+      />
     </>
   );
 };
diff --git a/frontend/src/components/settings/admin/AdminDashboard.jsx b/frontend/src/components/settings/admin/AdminDashboard.jsx
new file mode 100644
index 0000000..74f468b
--- /dev/null
+++ b/frontend/src/components/settings/admin/AdminDashboard.jsx
@@ -0,0 +1,182 @@
+import React, { useState } from 'react';
+import {
+  Modal,
+  Table,
+  Button,
+  Group,
+  TextInput,
+  PasswordInput,
+  Select,
+  Stack,
+  Text,
+  ActionIcon,
+  Box,
+} from '@mantine/core';
+import { IconTrash, IconEdit, IconPlus } from '@tabler/icons-react';
+
+// Dummy data - replace with actual API calls in production
+const DUMMY_USERS = [
+  {
+    id: 1,
+    email: 'admin@example.com',
+    displayName: 'Admin User',
+    role: 'admin',
+    createdAt: '2024-01-01',
+  },
+  {
+    id: 2,
+    email: 'editor@example.com',
+    displayName: 'Editor User',
+    role: 'editor',
+    createdAt: '2024-01-02',
+  },
+  {
+    id: 3,
+    email: 'viewer@example.com',
+    displayName: 'Viewer User',
+    role: 'viewer',
+    createdAt: '2024-01-03',
+  },
+];
+
+const CreateUserModal = ({ opened, onClose, onCreateUser }) => {
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [displayName, setDisplayName] = useState('');
+  const [role, setRole] = useState('viewer');
+
+  const handleSubmit = () => {
+    onCreateUser({ email, password, displayName, role });
+    setEmail('');
+    setPassword('');
+    setDisplayName('');
+    setRole('viewer');
+    onClose();
+  };
+
+  return (
+    <Modal opened={opened} onClose={onClose} title="Create New User" centered>
+      <Stack>
+        <TextInput
+          label="Email"
+          required
+          value={email}
+          onChange={(e) => setEmail(e.currentTarget.value)}
+          placeholder="user@example.com"
+        />
+        <TextInput
+          label="Display Name"
+          value={displayName}
+          onChange={(e) => setDisplayName(e.currentTarget.value)}
+          placeholder="John Doe"
+        />
+        <PasswordInput
+          label="Password"
+          required
+          value={password}
+          onChange={(e) => setPassword(e.currentTarget.value)}
+          placeholder="Enter password"
+        />
+        <Select
+          label="Role"
+          required
+          value={role}
+          onChange={setRole}
+          data={[
+            { value: 'admin', label: 'Admin' },
+            { value: 'editor', label: 'Editor' },
+            { value: 'viewer', label: 'Viewer' },
+          ]}
+        />
+        <Group justify="flex-end" mt="md">
+          <Button variant="default" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button onClick={handleSubmit}>Create User</Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+};
+
+const AdminDashboard = ({ opened, onClose }) => {
+  const [users, setUsers] = useState(DUMMY_USERS);
+  const [createModalOpened, setCreateModalOpened] = useState(false);
+
+  const handleCreateUser = (newUser) => {
+    // In production, make an API call here
+    setUsers([
+      ...users,
+      { ...newUser, id: users.length + 1, createdAt: new Date().toISOString() },
+    ]);
+  };
+
+  const handleDeleteUser = (userId) => {
+    // In production, make an API call here
+    setUsers(users.filter((user) => user.id !== userId));
+  };
+
+  const rows = users.map((user) => (
+    <Table.Tr key={user.id}>
+      <Table.Td>{user.email}</Table.Td>
+      <Table.Td>{user.displayName}</Table.Td>
+      <Table.Td>
+        <Text transform="capitalize">{user.role}</Text>
+      </Table.Td>
+      <Table.Td>{new Date(user.createdAt).toLocaleDateString()}</Table.Td>
+      <Table.Td>
+        <Group gap="xs" justify="flex-end">
+          <ActionIcon variant="subtle" color="blue">
+            <IconEdit size={16} />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            color="red"
+            onClick={() => handleDeleteUser(user.id)}
+          >
+            <IconTrash size={16} />
+          </ActionIcon>
+        </Group>
+      </Table.Td>
+    </Table.Tr>
+  ));
+
+  return (
+    <Modal opened={opened} onClose={onClose} size="xl" title="Admin Dashboard">
+      <Box>
+        <Group justify="space-between" mb="md">
+          <Text size="xl" fw={700}>
+            User Management
+          </Text>
+          <Button
+            leftSection={<IconPlus size={16} />}
+            onClick={() => setCreateModalOpened(true)}
+          >
+            Create User
+          </Button>
+        </Group>
+
+        <Table striped highlightOnHover withTableBorder>
+          <Table.Thead>
+            <Table.Tr>
+              <Table.Th>Email</Table.Th>
+              <Table.Th>Display Name</Table.Th>
+              <Table.Th>Role</Table.Th>
+              <Table.Th>Created At</Table.Th>
+              <Table.Th style={{ width: 100 }}>Actions</Table.Th>
+            </Table.Tr>
+          </Table.Thead>
+          <Table.Tbody>{rows}</Table.Tbody>
+        </Table>
+
+        <CreateUserModal
+          opened={createModalOpened}
+          onClose={() => setCreateModalOpened(false)}
+          onCreateUser={handleCreateUser}
+        />
+      </Box>
+    </Modal>
+  );
+};
+
+export default AdminDashboard;

From 0480c165ae2b7a1e26719fd3ef8e82a082edb368 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Thu, 7 Nov 2024 21:32:09 +0100
Subject: [PATCH 02/11] Implement admin api handlers

---
 backend/internal/api/routes.go              |  17 +-
 backend/internal/db/admin.go                |  80 ++++++++
 backend/internal/db/db.go                   |   5 +-
 backend/internal/db/migrations.go           |   2 +
 backend/internal/db/system_settings.go      |   1 +
 backend/internal/db/users.go                |   8 +
 backend/internal/db/workspaces.go           |  10 +
 backend/internal/handlers/admin_handlers.go | 215 ++++++++++++++++++++
 8 files changed, 333 insertions(+), 5 deletions(-)
 create mode 100644 backend/internal/db/admin.go
 create mode 100644 backend/internal/handlers/admin_handlers.go

diff --git a/backend/internal/api/routes.go b/backend/internal/api/routes.go
index ef4ae14..ddb350c 100644
--- a/backend/internal/api/routes.go
+++ b/backend/internal/api/routes.go
@@ -1,3 +1,4 @@
+// Package api contains the API routes for the application. It sets up the routes for the public and protected endpoints, as well as the admin-only routes.
 package api
 
 import (
@@ -10,6 +11,7 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
+// SetupRoutes configures the API routes
 func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.FileSystem, authMiddleware *auth.Middleware, sessionService *auth.SessionService) {
 
 	handler := &handlers.Handler{
@@ -38,11 +40,18 @@ func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.FileSystem, authMiddlew
 		r.Delete("/profile", handler.DeleteAccount())
 
 		// Admin-only routes
-		r.Group(func(r chi.Router) {
+		r.Route("/admin", func(r chi.Router) {
 			r.Use(authMiddleware.RequireRole("admin"))
-			// r.Get("/admin/users", ListUsers(db))
-			// r.Post("/admin/users", CreateUser(db))
-			// r.Delete("/admin/users/{userId}", DeleteUser(db))
+			// User management
+			r.Route("/users", func(r chi.Router) {
+				r.Get("/", handler.AdminListUsers())
+				r.Post("/", handler.AdminCreateUser())
+				r.Get("/{userId}", handler.AdminGetUser())
+				r.Put("/{userId}", handler.AdminUpdateUser())
+				r.Delete("/{userId}", handler.AdminDeleteUser())
+			})
+			// System stats
+			r.Get("/stats", handler.AdminGetSystemStats())
 		})
 
 		// Workspace routes
diff --git a/backend/internal/db/admin.go b/backend/internal/db/admin.go
new file mode 100644
index 0000000..3b8432d
--- /dev/null
+++ b/backend/internal/db/admin.go
@@ -0,0 +1,80 @@
+// Package db provides the database access layer for the application. It contains methods for interacting with the database, such as creating, updating, and deleting records.
+package db
+
+import "novamd/internal/models"
+
+// SystemStats represents system-wide statistics
+type SystemStats struct {
+	TotalUsers      int `json:"totalUsers"`
+	TotalWorkspaces int `json:"totalWorkspaces"`
+	ActiveUsers     int `json:"activeUsers"` // Users with activity in last 30 days
+	StorageUsed     int `json:"storageUsed"` // Total storage used in bytes
+	TotalFiles      int `json:"totalFiles"`  // Total number of files across all workspaces
+}
+
+// GetAllUsers returns a list of all users in the system
+func (db *DB) GetAllUsers() ([]*models.User, error) {
+	rows, err := db.Query(`
+		SELECT 
+			id, email, display_name, role, created_at,
+			last_workspace_id
+		FROM users
+		ORDER BY id ASC`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var users []*models.User
+	for rows.Next() {
+		user := &models.User{}
+		err := rows.Scan(
+			&user.ID, &user.Email, &user.DisplayName, &user.Role,
+			&user.CreatedAt, &user.LastWorkspaceID,
+		)
+		if err != nil {
+			return nil, err
+		}
+		users = append(users, user)
+	}
+	return users, nil
+}
+
+// GetSystemStats returns system-wide statistics
+func (db *DB) GetSystemStats() (*SystemStats, error) {
+	stats := &SystemStats{}
+
+	// Get total users
+	err := db.QueryRow("SELECT COUNT(*) FROM users").Scan(&stats.TotalUsers)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get total workspaces
+	err = db.QueryRow("SELECT COUNT(*) FROM workspaces").Scan(&stats.TotalWorkspaces)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get active users (users with activity in last 30 days)
+	err = db.QueryRow(`
+		SELECT COUNT(DISTINCT user_id) 
+		FROM sessions 
+		WHERE created_at > datetime('now', '-30 days')`).
+		Scan(&stats.ActiveUsers)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get total files and storage used
+	// Note: This assumes you're tracking file sizes in your filesystem
+	err = db.QueryRow(`
+		SELECT COUNT(*), COALESCE(SUM(size), 0) 
+		FROM files`).
+		Scan(&stats.TotalFiles, &stats.StorageUsed)
+	if err != nil {
+		return nil, err
+	}
+
+	return stats, nil
+}
diff --git a/backend/internal/db/db.go b/backend/internal/db/db.go
index d176700..8ca51c3 100644
--- a/backend/internal/db/db.go
+++ b/backend/internal/db/db.go
@@ -6,14 +6,16 @@ import (
 
 	"novamd/internal/crypto"
 
-	_ "github.com/mattn/go-sqlite3"
+	_ "github.com/mattn/go-sqlite3" // SQLite driver
 )
 
+// DB represents the database connection
 type DB struct {
 	*sql.DB
 	crypto *crypto.Crypto
 }
 
+// Init initializes the database connection
 func Init(dbPath string, encryptionKey string) (*DB, error) {
 	db, err := sql.Open("sqlite3", dbPath)
 	if err != nil {
@@ -42,6 +44,7 @@ func Init(dbPath string, encryptionKey string) (*DB, error) {
 	return database, nil
 }
 
+// Close closes the database connection
 func (db *DB) Close() error {
 	return db.DB.Close()
 }
diff --git a/backend/internal/db/migrations.go b/backend/internal/db/migrations.go
index ae5e4c9..84560f5 100644
--- a/backend/internal/db/migrations.go
+++ b/backend/internal/db/migrations.go
@@ -5,6 +5,7 @@ import (
 	"log"
 )
 
+// Migration represents a database migration
 type Migration struct {
 	Version int
 	SQL     string
@@ -78,6 +79,7 @@ var migrations = []Migration{
 	},
 }
 
+// Migrate applies all database migrations
 func (db *DB) Migrate() error {
 	// Create migrations table if it doesn't exist
 	_, err := db.Exec(`CREATE TABLE IF NOT EXISTS migrations (
diff --git a/backend/internal/db/system_settings.go b/backend/internal/db/system_settings.go
index 0c8f75b..76fdfa5 100644
--- a/backend/internal/db/system_settings.go
+++ b/backend/internal/db/system_settings.go
@@ -7,6 +7,7 @@ import (
 )
 
 const (
+	// JWTSecretKey is the key for the JWT secret in the system settings
 	JWTSecretKey = "jwt_secret"
 )
 
diff --git a/backend/internal/db/users.go b/backend/internal/db/users.go
index db350e7..9ce15ab 100644
--- a/backend/internal/db/users.go
+++ b/backend/internal/db/users.go
@@ -5,6 +5,7 @@ import (
 	"novamd/internal/models"
 )
 
+// CreateUser inserts a new user record into the database
 func (db *DB) CreateUser(user *models.User) error {
 	tx, err := db.Begin()
 	if err != nil {
@@ -54,6 +55,7 @@ func (db *DB) CreateUser(user *models.User) error {
 	return nil
 }
 
+// Helper function to create a workspace in a transaction
 func (db *DB) createWorkspaceTx(tx *sql.Tx, workspace *models.Workspace) error {
 	result, err := tx.Exec(`
 		INSERT INTO workspaces (
@@ -78,6 +80,7 @@ func (db *DB) createWorkspaceTx(tx *sql.Tx, workspace *models.Workspace) error {
 	return nil
 }
 
+// GetUserByID retrieves a user by ID
 func (db *DB) GetUserByID(id int) (*models.User, error) {
 	user := &models.User{}
 	err := db.QueryRow(`
@@ -94,6 +97,7 @@ func (db *DB) GetUserByID(id int) (*models.User, error) {
 	return user, nil
 }
 
+// GetUserByEmail retrieves a user by email
 func (db *DB) GetUserByEmail(email string) (*models.User, error) {
 	user := &models.User{}
 	err := db.QueryRow(`
@@ -111,6 +115,7 @@ func (db *DB) GetUserByEmail(email string) (*models.User, error) {
 	return user, nil
 }
 
+// UpdateUser updates a user's information
 func (db *DB) UpdateUser(user *models.User) error {
 	_, err := db.Exec(`
 		UPDATE users
@@ -120,6 +125,7 @@ func (db *DB) UpdateUser(user *models.User) error {
 	return err
 }
 
+// UpdateLastWorkspace updates the last workspace the user accessed
 func (db *DB) UpdateLastWorkspace(userID int, workspaceName string) error {
 	tx, err := db.Begin()
 	if err != nil {
@@ -142,6 +148,7 @@ func (db *DB) UpdateLastWorkspace(userID int, workspaceName string) error {
 	return tx.Commit()
 }
 
+// DeleteUser deletes a user and all their workspaces
 func (db *DB) DeleteUser(id int) error {
 	tx, err := db.Begin()
 	if err != nil {
@@ -164,6 +171,7 @@ func (db *DB) DeleteUser(id int) error {
 	return tx.Commit()
 }
 
+// GetLastWorkspaceName returns the name of the last workspace the user accessed
 func (db *DB) GetLastWorkspaceName(userID int) (string, error) {
 	var workspaceName string
 	err := db.QueryRow(`
diff --git a/backend/internal/db/workspaces.go b/backend/internal/db/workspaces.go
index d339075..e3f07d9 100644
--- a/backend/internal/db/workspaces.go
+++ b/backend/internal/db/workspaces.go
@@ -6,6 +6,7 @@ import (
 	"novamd/internal/models"
 )
 
+// CreateWorkspace inserts a new workspace record into the database
 func (db *DB) CreateWorkspace(workspace *models.Workspace) error {
 	// Set default settings if not provided
 	if workspace.Theme == "" {
@@ -40,6 +41,7 @@ func (db *DB) CreateWorkspace(workspace *models.Workspace) error {
 	return nil
 }
 
+// GetWorkspaceByID retrieves a workspace by its ID
 func (db *DB) GetWorkspaceByID(id int) (*models.Workspace, error) {
 	workspace := &models.Workspace{}
 	var encryptedToken string
@@ -72,6 +74,7 @@ func (db *DB) GetWorkspaceByID(id int) (*models.Workspace, error) {
 	return workspace, nil
 }
 
+// GetWorkspaceByName retrieves a workspace by its name and user ID
 func (db *DB) GetWorkspaceByName(userID int, workspaceName string) (*models.Workspace, error) {
 	workspace := &models.Workspace{}
 	var encryptedToken string
@@ -104,6 +107,7 @@ func (db *DB) GetWorkspaceByName(userID int, workspaceName string) (*models.Work
 	return workspace, nil
 }
 
+// UpdateWorkspace updates a workspace record in the database
 func (db *DB) UpdateWorkspace(workspace *models.Workspace) error {
 	// Encrypt token before storing
 	encryptedToken, err := db.encryptToken(workspace.GitToken)
@@ -139,6 +143,7 @@ func (db *DB) UpdateWorkspace(workspace *models.Workspace) error {
 	return err
 }
 
+// GetWorkspacesByUserID retrieves all workspaces for a user
 func (db *DB) GetWorkspacesByUserID(userID int) ([]*models.Workspace, error) {
 	rows, err := db.Query(`
 		SELECT 
@@ -208,26 +213,31 @@ func (db *DB) UpdateWorkspaceSettings(workspace *models.Workspace) error {
 	return err
 }
 
+// DeleteWorkspace removes a workspace record from the database
 func (db *DB) DeleteWorkspace(id int) error {
 	_, err := db.Exec("DELETE FROM workspaces WHERE id = ?", id)
 	return err
 }
 
+// DeleteWorkspaceTx removes a workspace record from the database within a transaction
 func (db *DB) DeleteWorkspaceTx(tx *sql.Tx, id int) error {
 	_, err := tx.Exec("DELETE FROM workspaces WHERE id = ?", id)
 	return err
 }
 
+// UpdateLastWorkspaceTx sets the last workspace for a user in with a transaction
 func (db *DB) UpdateLastWorkspaceTx(tx *sql.Tx, userID, workspaceID int) error {
 	_, err := tx.Exec("UPDATE users SET last_workspace_id = ? WHERE id = ?", workspaceID, userID)
 	return err
 }
 
+// UpdateLastOpenedFile updates the last opened file path for a workspace
 func (db *DB) UpdateLastOpenedFile(workspaceID int, filePath string) error {
 	_, err := db.Exec("UPDATE workspaces SET last_opened_file_path = ? WHERE id = ?", filePath, workspaceID)
 	return err
 }
 
+// GetLastOpenedFile retrieves the last opened file path for a workspace
 func (db *DB) GetLastOpenedFile(workspaceID int) (string, error) {
 	var filePath sql.NullString
 	err := db.QueryRow("SELECT last_opened_file_path FROM workspaces WHERE id = ?", workspaceID).Scan(&filePath)
diff --git a/backend/internal/handlers/admin_handlers.go b/backend/internal/handlers/admin_handlers.go
new file mode 100644
index 0000000..6b3c4a9
--- /dev/null
+++ b/backend/internal/handlers/admin_handlers.go
@@ -0,0 +1,215 @@
+package handlers
+
+import (
+	"encoding/json"
+	"net/http"
+	"novamd/internal/httpcontext"
+	"novamd/internal/models"
+	"strconv"
+
+	"github.com/go-chi/chi/v5"
+	"golang.org/x/crypto/bcrypt"
+)
+
+type CreateUserRequest struct {
+	Email       string          `json:"email"`
+	DisplayName string          `json:"displayName"`
+	Password    string          `json:"password"`
+	Role        models.UserRole `json:"role"`
+}
+
+type UpdateUserRequest struct {
+	Email       string          `json:"email,omitempty"`
+	DisplayName string          `json:"displayName,omitempty"`
+	Password    string          `json:"password,omitempty"`
+	Role        models.UserRole `json:"role,omitempty"`
+}
+
+// AdminListUsers returns a list of all users
+func (h *Handler) AdminListUsers() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		users, err := h.DB.GetAllUsers()
+		if err != nil {
+			http.Error(w, "Failed to list users", http.StatusInternalServerError)
+			return
+		}
+
+		respondJSON(w, users)
+	}
+}
+
+// AdminCreateUser creates a new user
+func (h *Handler) AdminCreateUser() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req CreateUserRequest
+		if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+			http.Error(w, "Invalid request body", http.StatusBadRequest)
+			return
+		}
+
+		// Validate request
+		if req.Email == "" || req.Password == "" || req.Role == "" {
+			http.Error(w, "Email, password, and role are required", http.StatusBadRequest)
+			return
+		}
+
+		// Check if email already exists
+		existingUser, err := h.DB.GetUserByEmail(req.Email)
+		if err == nil && existingUser != nil {
+			http.Error(w, "Email already exists", http.StatusConflict)
+			return
+		}
+
+		// Hash password
+		hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
+		if err != nil {
+			http.Error(w, "Failed to hash password", http.StatusInternalServerError)
+			return
+		}
+
+		// Create user
+		user := &models.User{
+			Email:        req.Email,
+			DisplayName:  req.DisplayName,
+			PasswordHash: string(hashedPassword),
+			Role:         req.Role,
+		}
+
+		if err := h.DB.CreateUser(user); err != nil {
+			http.Error(w, "Failed to create user", http.StatusInternalServerError)
+			return
+		}
+
+		// Initialize user workspace
+		if err := h.FS.InitializeUserWorkspace(user.ID, user.LastWorkspaceID); err != nil {
+			http.Error(w, "Failed to initialize user workspace", http.StatusInternalServerError)
+			return
+		}
+
+		respondJSON(w, user)
+	}
+}
+
+// AdminGetUser gets a specific user by ID
+func (h *Handler) AdminGetUser() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		userID, err := strconv.Atoi(chi.URLParam(r, "userId"))
+		if err != nil {
+			http.Error(w, "Invalid user ID", http.StatusBadRequest)
+			return
+		}
+
+		user, err := h.DB.GetUserByID(userID)
+		if err != nil {
+			http.Error(w, "User not found", http.StatusNotFound)
+			return
+		}
+
+		respondJSON(w, user)
+	}
+}
+
+// AdminUpdateUser updates a specific user
+func (h *Handler) AdminUpdateUser() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		userID, err := strconv.Atoi(chi.URLParam(r, "userId"))
+		if err != nil {
+			http.Error(w, "Invalid user ID", http.StatusBadRequest)
+			return
+		}
+
+		// Get existing user
+		user, err := h.DB.GetUserByID(userID)
+		if err != nil {
+			http.Error(w, "User not found", http.StatusNotFound)
+			return
+		}
+
+		var req UpdateUserRequest
+		if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+			http.Error(w, "Invalid request body", http.StatusBadRequest)
+			return
+		}
+
+		// Update fields if provided
+		if req.Email != "" {
+			user.Email = req.Email
+		}
+		if req.DisplayName != "" {
+			user.DisplayName = req.DisplayName
+		}
+		if req.Role != "" {
+			user.Role = req.Role
+		}
+		if req.Password != "" {
+			hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
+			if err != nil {
+				http.Error(w, "Failed to hash password", http.StatusInternalServerError)
+				return
+			}
+			user.PasswordHash = string(hashedPassword)
+		}
+
+		if err := h.DB.UpdateUser(user); err != nil {
+			http.Error(w, "Failed to update user", http.StatusInternalServerError)
+			return
+		}
+
+		respondJSON(w, user)
+	}
+}
+
+// AdminDeleteUser deletes a specific user
+func (h *Handler) AdminDeleteUser() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx, ok := httpcontext.GetRequestContext(w, r)
+		if !ok {
+			return
+		}
+
+		userID, err := strconv.Atoi(chi.URLParam(r, "userId"))
+		if err != nil {
+			http.Error(w, "Invalid user ID", http.StatusBadRequest)
+			return
+		}
+
+		// Prevent admin from deleting themselves
+		if userID == ctx.UserID {
+			http.Error(w, "Cannot delete your own account", http.StatusBadRequest)
+			return
+		}
+
+		// Get user before deletion to check role
+		user, err := h.DB.GetUserByID(userID)
+		if err != nil {
+			http.Error(w, "User not found", http.StatusNotFound)
+			return
+		}
+
+		// Prevent deletion of other admin users
+		if user.Role == models.RoleAdmin && ctx.UserID != userID {
+			http.Error(w, "Cannot delete other admin users", http.StatusForbidden)
+			return
+		}
+
+		if err := h.DB.DeleteUser(userID); err != nil {
+			http.Error(w, "Failed to delete user", http.StatusInternalServerError)
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+	}
+}
+
+// AdminGetSystemStats returns system-wide statistics for admins
+func (h *Handler) AdminGetSystemStats() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		stats, err := h.DB.GetSystemStats()
+		if err != nil {
+			http.Error(w, "Failed to get system stats", http.StatusInternalServerError)
+			return
+		}
+
+		respondJSON(w, stats)
+	}
+}

From 51751a5af6930c39349183a90b56e8908d72add5 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Thu, 7 Nov 2024 22:12:37 +0100
Subject: [PATCH 03/11] Load users in AdminDashboard

---
 .../settings/admin/AdminDashboard.jsx         | 106 ++++++------
 frontend/src/hooks/useAdmin.js                | 155 ++++++++++++++++++
 frontend/src/services/adminApi.js             |  39 +++++
 3 files changed, 254 insertions(+), 46 deletions(-)
 create mode 100644 frontend/src/hooks/useAdmin.js
 create mode 100644 frontend/src/services/adminApi.js

diff --git a/frontend/src/components/settings/admin/AdminDashboard.jsx b/frontend/src/components/settings/admin/AdminDashboard.jsx
index 74f468b..3345ce2 100644
--- a/frontend/src/components/settings/admin/AdminDashboard.jsx
+++ b/frontend/src/components/settings/admin/AdminDashboard.jsx
@@ -11,47 +11,33 @@ import {
   Text,
   ActionIcon,
   Box,
+  LoadingOverlay,
+  Alert,
 } from '@mantine/core';
-import { IconTrash, IconEdit, IconPlus } from '@tabler/icons-react';
+import {
+  IconTrash,
+  IconEdit,
+  IconPlus,
+  IconAlertCircle,
+} from '@tabler/icons-react';
+import { useAdmin } from '../../../hooks/useAdmin';
+import { useAuth } from '../../../contexts/AuthContext';
 
-// Dummy data - replace with actual API calls in production
-const DUMMY_USERS = [
-  {
-    id: 1,
-    email: 'admin@example.com',
-    displayName: 'Admin User',
-    role: 'admin',
-    createdAt: '2024-01-01',
-  },
-  {
-    id: 2,
-    email: 'editor@example.com',
-    displayName: 'Editor User',
-    role: 'editor',
-    createdAt: '2024-01-02',
-  },
-  {
-    id: 3,
-    email: 'viewer@example.com',
-    displayName: 'Viewer User',
-    role: 'viewer',
-    createdAt: '2024-01-03',
-  },
-];
-
-const CreateUserModal = ({ opened, onClose, onCreateUser }) => {
+const CreateUserModal = ({ opened, onClose, onCreateUser, loading }) => {
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [displayName, setDisplayName] = useState('');
   const [role, setRole] = useState('viewer');
 
-  const handleSubmit = () => {
-    onCreateUser({ email, password, displayName, role });
-    setEmail('');
-    setPassword('');
-    setDisplayName('');
-    setRole('viewer');
-    onClose();
+  const handleSubmit = async () => {
+    const result = await onCreateUser({ email, password, displayName, role });
+    if (result.success) {
+      setEmail('');
+      setPassword('');
+      setDisplayName('');
+      setRole('viewer');
+      onClose();
+    }
   };
 
   return (
@@ -92,7 +78,9 @@ const CreateUserModal = ({ opened, onClose, onCreateUser }) => {
           <Button variant="default" onClick={onClose}>
             Cancel
           </Button>
-          <Button onClick={handleSubmit}>Create User</Button>
+          <Button onClick={handleSubmit} loading={loading}>
+            Create User
+          </Button>
         </Group>
       </Stack>
     </Modal>
@@ -100,20 +88,31 @@ const CreateUserModal = ({ opened, onClose, onCreateUser }) => {
 };
 
 const AdminDashboard = ({ opened, onClose }) => {
-  const [users, setUsers] = useState(DUMMY_USERS);
+  const {
+    data: users,
+    loading,
+    error,
+    create,
+    delete: deleteUser,
+  } = useAdmin('users');
   const [createModalOpened, setCreateModalOpened] = useState(false);
+  const { user: currentUser } = useAuth();
 
-  const handleCreateUser = (newUser) => {
-    // In production, make an API call here
-    setUsers([
-      ...users,
-      { ...newUser, id: users.length + 1, createdAt: new Date().toISOString() },
-    ]);
+  const handleCreateUser = async (userData) => {
+    return await create(userData);
   };
 
-  const handleDeleteUser = (userId) => {
-    // In production, make an API call here
-    setUsers(users.filter((user) => user.id !== userId));
+  const handleDeleteUser = async (userId) => {
+    if (userId === currentUser.id) {
+      notifications.show({
+        title: 'Error',
+        message: 'You cannot delete your own account',
+        color: 'red',
+      });
+      return;
+    }
+
+    return await deleteUser(userId);
   };
 
   const rows = users.map((user) => (
@@ -133,6 +132,7 @@ const AdminDashboard = ({ opened, onClose }) => {
             variant="subtle"
             color="red"
             onClick={() => handleDeleteUser(user.id)}
+            disabled={user.id === currentUser.id}
           >
             <IconTrash size={16} />
           </ActionIcon>
@@ -143,7 +143,20 @@ const AdminDashboard = ({ opened, onClose }) => {
 
   return (
     <Modal opened={opened} onClose={onClose} size="xl" title="Admin Dashboard">
-      <Box>
+      <Box pos="relative">
+        <LoadingOverlay visible={loading} />
+
+        {error && (
+          <Alert
+            icon={<IconAlertCircle size={16} />}
+            title="Error"
+            color="red"
+            mb="md"
+          >
+            {error}
+          </Alert>
+        )}
+
         <Group justify="space-between" mb="md">
           <Text size="xl" fw={700}>
             User Management
@@ -173,6 +186,7 @@ const AdminDashboard = ({ opened, onClose }) => {
           opened={createModalOpened}
           onClose={() => setCreateModalOpened(false)}
           onCreateUser={handleCreateUser}
+          loading={loading}
         />
       </Box>
     </Modal>
diff --git a/frontend/src/hooks/useAdmin.js b/frontend/src/hooks/useAdmin.js
new file mode 100644
index 0000000..08d3cc4
--- /dev/null
+++ b/frontend/src/hooks/useAdmin.js
@@ -0,0 +1,155 @@
+import { useState, useCallback, useEffect } from 'react';
+import { notifications } from '@mantine/notifications';
+import * as adminApi from '../services/adminApi';
+
+export const useAdmin = (resource) => {
+  const [data, setData] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  const fetchData = useCallback(async () => {
+    setLoading(true);
+    try {
+      let result;
+      switch (resource) {
+        case 'users':
+          result = await adminApi.listUsers();
+          break;
+        case 'stats':
+          result = await adminApi.getSystemStats();
+          break;
+        default:
+          throw new Error(`Unknown resource type: ${resource}`);
+      }
+      setData(result);
+      setError(null);
+    } catch (err) {
+      console.error(`Failed to fetch ${resource}:`, err);
+      setError(err.message);
+      notifications.show({
+        title: 'Error',
+        message: `Failed to load ${resource}. Please try again.`,
+        color: 'red',
+      });
+    } finally {
+      setLoading(false);
+    }
+  }, [resource]);
+
+  const createItem = useCallback(
+    async (itemData) => {
+      try {
+        let newItem;
+        switch (resource) {
+          case 'users':
+            newItem = await adminApi.createUser(itemData);
+            break;
+          default:
+            throw new Error(`Create not supported for resource: ${resource}`);
+        }
+        setData((prevData) =>
+          Array.isArray(prevData) ? [...prevData, newItem] : prevData
+        );
+        notifications.show({
+          title: 'Success',
+          message: `${resource} created successfully`,
+          color: 'green',
+        });
+        return { success: true, data: newItem };
+      } catch (err) {
+        console.error(`Failed to create ${resource}:`, err);
+        notifications.show({
+          title: 'Error',
+          message: err.message || `Failed to create ${resource}`,
+          color: 'red',
+        });
+        return { success: false, error: err.message };
+      }
+    },
+    [resource]
+  );
+
+  const deleteItem = useCallback(
+    async (itemId) => {
+      try {
+        switch (resource) {
+          case 'users':
+            await adminApi.deleteUser(itemId);
+            break;
+          default:
+            throw new Error(`Delete not supported for resource: ${resource}`);
+        }
+        setData((prevData) =>
+          Array.isArray(prevData)
+            ? prevData.filter((item) => item.id !== itemId)
+            : prevData
+        );
+        notifications.show({
+          title: 'Success',
+          message: `${resource} deleted successfully`,
+          color: 'green',
+        });
+        return { success: true };
+      } catch (err) {
+        console.error(`Failed to delete ${resource}:`, err);
+        notifications.show({
+          title: 'Error',
+          message: err.message || `Failed to delete ${resource}`,
+          color: 'red',
+        });
+        return { success: false, error: err.message };
+      }
+    },
+    [resource]
+  );
+
+  const updateItem = useCallback(
+    async (itemId, itemData) => {
+      try {
+        let updatedItem;
+        switch (resource) {
+          case 'users':
+            updatedItem = await adminApi.updateUser(itemId, itemData);
+            break;
+          default:
+            throw new Error(`Update not supported for resource: ${resource}`);
+        }
+        setData((prevData) =>
+          Array.isArray(prevData)
+            ? prevData.map((item) => (item.id === itemId ? updatedItem : item))
+            : prevData
+        );
+        notifications.show({
+          title: 'Success',
+          message: `${resource} updated successfully`,
+          color: 'green',
+        });
+        return { success: true, data: updatedItem };
+      } catch (err) {
+        console.error(`Failed to update ${resource}:`, err);
+        notifications.show({
+          title: 'Error',
+          message: err.message || `Failed to update ${resource}`,
+          color: 'red',
+        });
+        return { success: false, error: err.message };
+      }
+    },
+    [resource]
+  );
+
+  // Fetch data on mount
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+
+  return {
+    data,
+    loading,
+    error,
+    refresh: fetchData,
+    create: createItem,
+    delete: deleteItem,
+    update: updateItem,
+  };
+};
diff --git a/frontend/src/services/adminApi.js b/frontend/src/services/adminApi.js
new file mode 100644
index 0000000..3c6c4a0
--- /dev/null
+++ b/frontend/src/services/adminApi.js
@@ -0,0 +1,39 @@
+import { apiCall } from './authApi';
+import { API_BASE_URL } from '../utils/constants';
+
+const ADMIN_BASE_URL = `${API_BASE_URL}/admin`;
+
+// User Management
+export const listUsers = async () => {
+  const response = await apiCall(`${ADMIN_BASE_URL}/users`);
+  return response.json();
+};
+
+export const createUser = async (userData) => {
+  const response = await apiCall(`${ADMIN_BASE_URL}/users`, {
+    method: 'POST',
+    body: JSON.stringify(userData),
+  });
+  return response.json();
+};
+
+export const deleteUser = async (userId) => {
+  const response = await apiCall(`${ADMIN_BASE_URL}/users/${userId}`, {
+    method: 'DELETE',
+  });
+  return response.json();
+};
+
+export const updateUser = async (userId, userData) => {
+  const response = await apiCall(`${ADMIN_BASE_URL}/users/${userId}`, {
+    method: 'PUT',
+    body: JSON.stringify(userData),
+  });
+  return response.json();
+};
+
+// System Statistics
+export const getSystemStats = async () => {
+  const response = await apiCall(`${ADMIN_BASE_URL}/stats`);
+  return response.json();
+};

From dd3ea9f65f54c07f66a18fb1f9d8cdb2bea770da Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Fri, 8 Nov 2024 23:49:12 +0100
Subject: [PATCH 04/11] Improve admin dashboard

---
 backend/internal/db/users.go                  |  22 +-
 backend/internal/handlers/admin_handlers.go   |   9 +-
 backend/internal/user/user.go                 |  57 +----
 .../modals/user/CreateUserModal.jsx           |  76 +++++++
 .../modals/user/DeleteUserModal.jsx           |  29 +++
 .../settings/admin/AdminDashboard.jsx         | 208 +++---------------
 .../settings/admin/AdminStatsTab.jsx          | 122 ++++++++++
 .../settings/admin/AdminUsersTab.jsx          | 142 ++++++++++++
 .../settings/admin/AdminWorkspacesTab.jsx     |  73 ++++++
 .../components/settings/admin/StatCard.jsx    |  20 ++
 frontend/src/services/adminApi.js             |   6 +-
 11 files changed, 517 insertions(+), 247 deletions(-)
 create mode 100644 frontend/src/components/modals/user/CreateUserModal.jsx
 create mode 100644 frontend/src/components/modals/user/DeleteUserModal.jsx
 create mode 100644 frontend/src/components/settings/admin/AdminStatsTab.jsx
 create mode 100644 frontend/src/components/settings/admin/AdminUsersTab.jsx
 create mode 100644 frontend/src/components/settings/admin/AdminWorkspacesTab.jsx
 create mode 100644 frontend/src/components/settings/admin/StatCard.jsx

diff --git a/backend/internal/db/users.go b/backend/internal/db/users.go
index 9ce15ab..3c7e40f 100644
--- a/backend/internal/db/users.go
+++ b/backend/internal/db/users.go
@@ -6,10 +6,10 @@ import (
 )
 
 // CreateUser inserts a new user record into the database
-func (db *DB) CreateUser(user *models.User) error {
+func (db *DB) CreateUser(user *models.User) (*models.User, error) {
 	tx, err := db.Begin()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -18,15 +18,21 @@ func (db *DB) CreateUser(user *models.User) error {
 		VALUES (?, ?, ?, ?)`,
 		user.Email, user.DisplayName, user.PasswordHash, user.Role)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	userID, err := result.LastInsertId()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	user.ID = int(userID)
 
+	// Retrieve the created_at timestamp
+	err = tx.QueryRow("SELECT created_at FROM users WHERE id = ?", user.ID).Scan(&user.CreatedAt)
+	if err != nil {
+		return nil, err
+	}
+
 	// Create default workspace with default settings
 	defaultWorkspace := &models.Workspace{
 		UserID: user.ID,
@@ -37,22 +43,22 @@ func (db *DB) CreateUser(user *models.User) error {
 	// Create workspace with settings
 	err = db.createWorkspaceTx(tx, defaultWorkspace)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	// Update user's last workspace ID
 	_, err = tx.Exec("UPDATE users SET last_workspace_id = ? WHERE id = ?", defaultWorkspace.ID, user.ID)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	user.LastWorkspaceID = defaultWorkspace.ID
-	return nil
+	return user, nil
 }
 
 // Helper function to create a workspace in a transaction
diff --git a/backend/internal/handlers/admin_handlers.go b/backend/internal/handlers/admin_handlers.go
index 6b3c4a9..4c78ed1 100644
--- a/backend/internal/handlers/admin_handlers.go
+++ b/backend/internal/handlers/admin_handlers.go
@@ -75,18 +75,19 @@ func (h *Handler) AdminCreateUser() http.HandlerFunc {
 			Role:         req.Role,
 		}
 
-		if err := h.DB.CreateUser(user); err != nil {
+		insertedUser, err := h.DB.CreateUser(user)
+		if err != nil {
 			http.Error(w, "Failed to create user", http.StatusInternalServerError)
 			return
 		}
 
 		// Initialize user workspace
-		if err := h.FS.InitializeUserWorkspace(user.ID, user.LastWorkspaceID); err != nil {
+		if err := h.FS.InitializeUserWorkspace(insertedUser.ID, insertedUser.LastWorkspaceID); err != nil {
 			http.Error(w, "Failed to initialize user workspace", http.StatusInternalServerError)
 			return
 		}
 
-		respondJSON(w, user)
+		respondJSON(w, insertedUser)
 	}
 }
 
@@ -197,7 +198,7 @@ func (h *Handler) AdminDeleteUser() http.HandlerFunc {
 			return
 		}
 
-		w.WriteHeader(http.StatusOK)
+		w.WriteHeader(http.StatusNoContent)
 	}
 }
 
diff --git a/backend/internal/user/user.go b/backend/internal/user/user.go
index dbfce37..fb83cc1 100644
--- a/backend/internal/user/user.go
+++ b/backend/internal/user/user.go
@@ -47,69 +47,18 @@ func (s *UserService) SetupAdminUser(adminEmail, adminPassword string) (*models.
 		Role:         models.RoleAdmin,
 	}
 
-	err = s.DB.CreateUser(adminUser)
+	createdUser, err := s.DB.CreateUser(adminUser)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create admin user: %w", err)
 	}
 
 	// Initialize workspace directory
-	err = s.FS.InitializeUserWorkspace(adminUser.ID, adminUser.LastWorkspaceID)
+	err = s.FS.InitializeUserWorkspace(createdUser.ID, createdUser.LastWorkspaceID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize admin workspace: %w", err)
 	}
 
-	log.Printf("Created admin user with ID: %d and default workspace with ID: %d", adminUser.ID, adminUser.LastWorkspaceID)
+	log.Printf("Created admin user with ID: %d and default workspace with ID: %d", createdUser.ID, createdUser.LastWorkspaceID)
 
 	return adminUser, nil
 }
-
-func (s *UserService) CreateUser(user *models.User) error {
-	err := s.DB.CreateUser(user)
-	if err != nil {
-		return fmt.Errorf("failed to create user: %w", err)
-	}
-
-	err = s.FS.InitializeUserWorkspace(user.ID, user.LastWorkspaceID)
-	if err != nil {
-		return fmt.Errorf("failed to initialize user workspace: %w", err)
-	}
-
-	return nil
-}
-
-func (s *UserService) GetUserByID(id int) (*models.User, error) {
-	return s.DB.GetUserByID(id)
-}
-
-func (s *UserService) GetUserByEmail(email string) (*models.User, error) {
-	return s.DB.GetUserByEmail(email)
-}
-
-func (s *UserService) UpdateUser(user *models.User) error {
-	return s.DB.UpdateUser(user)
-}
-
-func (s *UserService) DeleteUser(id int) error {
-	// First, get the user to check if they exist
-	user, err := s.DB.GetUserByID(id)
-	if err != nil {
-		return fmt.Errorf("failed to get user: %w", err)
-	}
-
-	// Get user's workspaces
-	workspaces, err := s.DB.GetWorkspacesByUserID(id)
-	if err != nil {
-		return fmt.Errorf("failed to get user's workspaces: %w", err)
-	}
-
-	// Delete workspace directories
-	for _, workspace := range workspaces {
-		err = s.FS.DeleteUserWorkspace(user.ID, workspace.ID)
-		if err != nil {
-			return fmt.Errorf("failed to delete workspace files: %w", err)
-		}
-	}
-
-	// Delete user from database (this will cascade delete workspaces)
-	return s.DB.DeleteUser(id)
-}
diff --git a/frontend/src/components/modals/user/CreateUserModal.jsx b/frontend/src/components/modals/user/CreateUserModal.jsx
new file mode 100644
index 0000000..23d5b5d
--- /dev/null
+++ b/frontend/src/components/modals/user/CreateUserModal.jsx
@@ -0,0 +1,76 @@
+import React, { useState } from 'react';
+import {
+  Modal,
+  Stack,
+  TextInput,
+  PasswordInput,
+  Select,
+  Button,
+  Group,
+} from '@mantine/core';
+
+const CreateUserModal = ({ opened, onClose, onCreateUser, loading }) => {
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [displayName, setDisplayName] = useState('');
+  const [role, setRole] = useState('viewer');
+
+  const handleSubmit = async () => {
+    const result = await onCreateUser({ email, password, displayName, role });
+    if (result.success) {
+      setEmail('');
+      setPassword('');
+      setDisplayName('');
+      setRole('viewer');
+      onClose();
+    }
+  };
+
+  return (
+    <Modal opened={opened} onClose={onClose} title="Create New User" centered>
+      <Stack>
+        <TextInput
+          label="Email"
+          required
+          value={email}
+          onChange={(e) => setEmail(e.currentTarget.value)}
+          placeholder="user@example.com"
+        />
+        <TextInput
+          label="Display Name"
+          value={displayName}
+          onChange={(e) => setDisplayName(e.currentTarget.value)}
+          placeholder="John Doe"
+        />
+        <PasswordInput
+          label="Password"
+          required
+          value={password}
+          onChange={(e) => setPassword(e.currentTarget.value)}
+          placeholder="Enter password"
+        />
+        <Select
+          label="Role"
+          required
+          value={role}
+          onChange={setRole}
+          data={[
+            { value: 'admin', label: 'Admin' },
+            { value: 'editor', label: 'Editor' },
+            { value: 'viewer', label: 'Viewer' },
+          ]}
+        />
+        <Group justify="flex-end" mt="md">
+          <Button variant="default" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button onClick={handleSubmit} loading={loading}>
+            Create User
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+};
+
+export default CreateUserModal;
diff --git a/frontend/src/components/modals/user/DeleteUserModal.jsx b/frontend/src/components/modals/user/DeleteUserModal.jsx
new file mode 100644
index 0000000..5763a0a
--- /dev/null
+++ b/frontend/src/components/modals/user/DeleteUserModal.jsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Modal, Text, Button, Group, Stack } from '@mantine/core';
+
+const DeleteUserModal = ({ opened, onClose, onConfirm, user, loading }) => (
+  <Modal
+    opened={opened}
+    onClose={onClose}
+    title="Delete User"
+    centered
+    size="sm"
+  >
+    <Stack>
+      <Text>
+        Are you sure you want to delete user "{user?.email}"? This action cannot
+        be undone and all associated data will be permanently deleted.
+      </Text>
+      <Group justify="flex-end" mt="xl">
+        <Button variant="default" onClick={onClose}>
+          Cancel
+        </Button>
+        <Button color="red" onClick={onConfirm} loading={loading}>
+          Delete User
+        </Button>
+      </Group>
+    </Stack>
+  </Modal>
+);
+
+export default DeleteUserModal;
diff --git a/frontend/src/components/settings/admin/AdminDashboard.jsx b/frontend/src/components/settings/admin/AdminDashboard.jsx
index 3345ce2..e095dc5 100644
--- a/frontend/src/components/settings/admin/AdminDashboard.jsx
+++ b/frontend/src/components/settings/admin/AdminDashboard.jsx
@@ -1,194 +1,42 @@
 import React, { useState } from 'react';
-import {
-  Modal,
-  Table,
-  Button,
-  Group,
-  TextInput,
-  PasswordInput,
-  Select,
-  Stack,
-  Text,
-  ActionIcon,
-  Box,
-  LoadingOverlay,
-  Alert,
-} from '@mantine/core';
-import {
-  IconTrash,
-  IconEdit,
-  IconPlus,
-  IconAlertCircle,
-} from '@tabler/icons-react';
-import { useAdmin } from '../../../hooks/useAdmin';
+import { Modal, Tabs } from '@mantine/core';
+import { IconUsers, IconFolders, IconChartBar } from '@tabler/icons-react';
 import { useAuth } from '../../../contexts/AuthContext';
-
-const CreateUserModal = ({ opened, onClose, onCreateUser, loading }) => {
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const [displayName, setDisplayName] = useState('');
-  const [role, setRole] = useState('viewer');
-
-  const handleSubmit = async () => {
-    const result = await onCreateUser({ email, password, displayName, role });
-    if (result.success) {
-      setEmail('');
-      setPassword('');
-      setDisplayName('');
-      setRole('viewer');
-      onClose();
-    }
-  };
-
-  return (
-    <Modal opened={opened} onClose={onClose} title="Create New User" centered>
-      <Stack>
-        <TextInput
-          label="Email"
-          required
-          value={email}
-          onChange={(e) => setEmail(e.currentTarget.value)}
-          placeholder="user@example.com"
-        />
-        <TextInput
-          label="Display Name"
-          value={displayName}
-          onChange={(e) => setDisplayName(e.currentTarget.value)}
-          placeholder="John Doe"
-        />
-        <PasswordInput
-          label="Password"
-          required
-          value={password}
-          onChange={(e) => setPassword(e.currentTarget.value)}
-          placeholder="Enter password"
-        />
-        <Select
-          label="Role"
-          required
-          value={role}
-          onChange={setRole}
-          data={[
-            { value: 'admin', label: 'Admin' },
-            { value: 'editor', label: 'Editor' },
-            { value: 'viewer', label: 'Viewer' },
-          ]}
-        />
-        <Group justify="flex-end" mt="md">
-          <Button variant="default" onClick={onClose}>
-            Cancel
-          </Button>
-          <Button onClick={handleSubmit} loading={loading}>
-            Create User
-          </Button>
-        </Group>
-      </Stack>
-    </Modal>
-  );
-};
+import AdminUsersTab from './AdminUsersTab';
+import AdminWorkspacesTab from './AdminWorkspacesTab';
+import AdminStatsTab from './AdminStatsTab';
 
 const AdminDashboard = ({ opened, onClose }) => {
-  const {
-    data: users,
-    loading,
-    error,
-    create,
-    delete: deleteUser,
-  } = useAdmin('users');
-  const [createModalOpened, setCreateModalOpened] = useState(false);
   const { user: currentUser } = useAuth();
-
-  const handleCreateUser = async (userData) => {
-    return await create(userData);
-  };
-
-  const handleDeleteUser = async (userId) => {
-    if (userId === currentUser.id) {
-      notifications.show({
-        title: 'Error',
-        message: 'You cannot delete your own account',
-        color: 'red',
-      });
-      return;
-    }
-
-    return await deleteUser(userId);
-  };
-
-  const rows = users.map((user) => (
-    <Table.Tr key={user.id}>
-      <Table.Td>{user.email}</Table.Td>
-      <Table.Td>{user.displayName}</Table.Td>
-      <Table.Td>
-        <Text transform="capitalize">{user.role}</Text>
-      </Table.Td>
-      <Table.Td>{new Date(user.createdAt).toLocaleDateString()}</Table.Td>
-      <Table.Td>
-        <Group gap="xs" justify="flex-end">
-          <ActionIcon variant="subtle" color="blue">
-            <IconEdit size={16} />
-          </ActionIcon>
-          <ActionIcon
-            variant="subtle"
-            color="red"
-            onClick={() => handleDeleteUser(user.id)}
-            disabled={user.id === currentUser.id}
-          >
-            <IconTrash size={16} />
-          </ActionIcon>
-        </Group>
-      </Table.Td>
-    </Table.Tr>
-  ));
+  const [activeTab, setActiveTab] = useState('users');
 
   return (
     <Modal opened={opened} onClose={onClose} size="xl" title="Admin Dashboard">
-      <Box pos="relative">
-        <LoadingOverlay visible={loading} />
+      <Tabs value={activeTab} onChange={setActiveTab}>
+        <Tabs.List>
+          <Tabs.Tab value="users" leftSection={<IconUsers size={16} />}>
+            Users
+          </Tabs.Tab>
+          <Tabs.Tab value="workspaces" leftSection={<IconFolders size={16} />}>
+            Workspaces
+          </Tabs.Tab>
+          <Tabs.Tab value="stats" leftSection={<IconChartBar size={16} />}>
+            Statistics
+          </Tabs.Tab>
+        </Tabs.List>
 
-        {error && (
-          <Alert
-            icon={<IconAlertCircle size={16} />}
-            title="Error"
-            color="red"
-            mb="md"
-          >
-            {error}
-          </Alert>
-        )}
+        <Tabs.Panel value="users" pt="md">
+          <AdminUsersTab currentUser={currentUser} />
+        </Tabs.Panel>
 
-        <Group justify="space-between" mb="md">
-          <Text size="xl" fw={700}>
-            User Management
-          </Text>
-          <Button
-            leftSection={<IconPlus size={16} />}
-            onClick={() => setCreateModalOpened(true)}
-          >
-            Create User
-          </Button>
-        </Group>
+        <Tabs.Panel value="workspaces" pt="md">
+          <AdminWorkspacesTab />
+        </Tabs.Panel>
 
-        <Table striped highlightOnHover withTableBorder>
-          <Table.Thead>
-            <Table.Tr>
-              <Table.Th>Email</Table.Th>
-              <Table.Th>Display Name</Table.Th>
-              <Table.Th>Role</Table.Th>
-              <Table.Th>Created At</Table.Th>
-              <Table.Th style={{ width: 100 }}>Actions</Table.Th>
-            </Table.Tr>
-          </Table.Thead>
-          <Table.Tbody>{rows}</Table.Tbody>
-        </Table>
-
-        <CreateUserModal
-          opened={createModalOpened}
-          onClose={() => setCreateModalOpened(false)}
-          onCreateUser={handleCreateUser}
-          loading={loading}
-        />
-      </Box>
+        <Tabs.Panel value="stats" pt="md">
+          <AdminStatsTab />
+        </Tabs.Panel>
+      </Tabs>
     </Modal>
   );
 };
diff --git a/frontend/src/components/settings/admin/AdminStatsTab.jsx b/frontend/src/components/settings/admin/AdminStatsTab.jsx
new file mode 100644
index 0000000..31c13eb
--- /dev/null
+++ b/frontend/src/components/settings/admin/AdminStatsTab.jsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import {
+  Grid,
+  Card,
+  Stack,
+  Text,
+  Title,
+  LoadingOverlay,
+  Alert,
+  RingProgress,
+} from '@mantine/core';
+import {
+  IconUsers,
+  IconFolders,
+  IconServer,
+  IconFiles,
+  IconAlertCircle,
+} from '@tabler/icons-react';
+import { useAdmin } from '../../../hooks/useAdmin';
+import StatCard from './StatCard';
+
+const formatBytes = (bytes) => {
+  const units = ['B', 'KB', 'MB', 'GB'];
+  let size = bytes;
+  let unitIndex = 0;
+  while (size >= 1024 && unitIndex < units.length - 1) {
+    size /= 1024;
+    unitIndex++;
+  }
+  return `${size.toFixed(1)} ${units[unitIndex]}`;
+};
+
+const AdminStatsTab = () => {
+  const { data: stats, loading, error } = useAdmin('stats');
+
+  if (loading) {
+    return <LoadingOverlay visible={true} />;
+  }
+
+  if (error) {
+    return (
+      <Alert icon={<IconAlertCircle size={16} />} title="Error" color="red">
+        {error}
+      </Alert>
+    );
+  }
+
+  return (
+    <Stack>
+      <Text size="xl" fw={700}>
+        System Statistics
+      </Text>
+
+      <Grid>
+        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
+          <StatCard
+            title="Total Users"
+            value={stats.totalUsers}
+            icon={IconUsers}
+            color="blue"
+          />
+        </Grid.Col>
+        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
+          <StatCard
+            title="Total Workspaces"
+            value={stats.totalWorkspaces}
+            icon={IconFolders}
+            color="grape"
+          />
+        </Grid.Col>
+        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
+          <StatCard
+            title="Storage Used"
+            value={formatBytes(stats.storageUsed)}
+            icon={IconServer}
+            color="teal"
+          />
+        </Grid.Col>
+        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
+          <StatCard
+            title="Total Files"
+            value={stats.totalFiles}
+            icon={IconFiles}
+            color="orange"
+          />
+        </Grid.Col>
+      </Grid>
+
+      <Grid mt="md">
+        <Grid.Col span={{ base: 12, md: 6 }}>
+          <Card withBorder>
+            <Stack align="center">
+              <Title order={3}>Active Users</Title>
+              <RingProgress
+                size={200}
+                thickness={16}
+                roundCaps
+                sections={[
+                  {
+                    value: (stats.activeUsers / stats.totalUsers) * 100,
+                    color: 'blue',
+                  },
+                ]}
+                label={
+                  <Text ta="center" fw={700} size="xl">
+                    {((stats.activeUsers / stats.totalUsers) * 100).toFixed(1)}%
+                  </Text>
+                }
+              />
+              <Text c="dimmed" size="sm">
+                {stats.activeUsers} out of {stats.totalUsers} users active in
+                last 30 days
+              </Text>
+            </Stack>
+          </Card>
+        </Grid.Col>
+      </Grid>
+    </Stack>
+  );
+};
+
+export default AdminStatsTab;
diff --git a/frontend/src/components/settings/admin/AdminUsersTab.jsx b/frontend/src/components/settings/admin/AdminUsersTab.jsx
new file mode 100644
index 0000000..0960058
--- /dev/null
+++ b/frontend/src/components/settings/admin/AdminUsersTab.jsx
@@ -0,0 +1,142 @@
+import React, { useState } from 'react';
+import {
+  Table,
+  Button,
+  Group,
+  Text,
+  ActionIcon,
+  Box,
+  LoadingOverlay,
+  Alert,
+} from '@mantine/core';
+import {
+  IconTrash,
+  IconEdit,
+  IconPlus,
+  IconAlertCircle,
+} from '@tabler/icons-react';
+import { notifications } from '@mantine/notifications';
+import { useAdmin } from '../../../hooks/useAdmin';
+import CreateUserModal from '../../modals/user/CreateUserModal';
+import DeleteUserModal from '../../modals/user/DeleteUserModal';
+
+const AdminUsersTab = ({ currentUser }) => {
+  const {
+    data: users,
+    loading,
+    error,
+    create,
+    delete: deleteUser,
+  } = useAdmin('users');
+  const [createModalOpened, setCreateModalOpened] = useState(false);
+  const [deleteModalData, setDeleteModalData] = useState(null);
+
+  const handleCreateUser = async (userData) => {
+    return await create(userData);
+  };
+
+  const handleDeleteClick = (user) => {
+    if (user.id === currentUser.id) {
+      notifications.show({
+        title: 'Error',
+        message: 'You cannot delete your own account',
+        color: 'red',
+      });
+      return;
+    }
+    setDeleteModalData(user);
+  };
+
+  const handleDeleteConfirm = async () => {
+    if (!deleteModalData) return;
+    const result = await deleteUser(deleteModalData.id);
+    if (result.success) {
+      setDeleteModalData(null);
+    }
+  };
+
+  const rows = users.map((user) => (
+    <Table.Tr key={user.id}>
+      <Table.Td>{user.email}</Table.Td>
+      <Table.Td>{user.displayName}</Table.Td>
+      <Table.Td>
+        <Text transform="capitalize">{user.role}</Text>
+      </Table.Td>
+      <Table.Td>{new Date(user.createdAt).toLocaleDateString()}</Table.Td>
+      <Table.Td>
+        <Group gap="xs" justify="flex-end">
+          <ActionIcon variant="subtle" color="blue">
+            <IconEdit size={16} />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            color="red"
+            onClick={() => handleDeleteClick(user)}
+            disabled={user.id === currentUser.id}
+          >
+            <IconTrash size={16} />
+          </ActionIcon>
+        </Group>
+      </Table.Td>
+    </Table.Tr>
+  ));
+
+  return (
+    <Box pos="relative">
+      <LoadingOverlay visible={loading} />
+
+      {error && (
+        <Alert
+          icon={<IconAlertCircle size={16} />}
+          title="Error"
+          color="red"
+          mb="md"
+        >
+          {error}
+        </Alert>
+      )}
+
+      <Group justify="space-between" mb="md">
+        <Text size="xl" fw={700}>
+          User Management
+        </Text>
+        <Button
+          leftSection={<IconPlus size={16} />}
+          onClick={() => setCreateModalOpened(true)}
+        >
+          Create User
+        </Button>
+      </Group>
+
+      <Table striped highlightOnHover withTableBorder>
+        <Table.Thead>
+          <Table.Tr>
+            <Table.Th>Email</Table.Th>
+            <Table.Th>Display Name</Table.Th>
+            <Table.Th>Role</Table.Th>
+            <Table.Th>Created At</Table.Th>
+            <Table.Th style={{ width: 100 }}>Actions</Table.Th>
+          </Table.Tr>
+        </Table.Thead>
+        <Table.Tbody>{rows}</Table.Tbody>
+      </Table>
+
+      <CreateUserModal
+        opened={createModalOpened}
+        onClose={() => setCreateModalOpened(false)}
+        onCreateUser={handleCreateUser}
+        loading={loading}
+      />
+
+      <DeleteUserModal
+        opened={!!deleteModalData}
+        onClose={() => setDeleteModalData(null)}
+        onConfirm={handleDeleteConfirm}
+        user={deleteModalData}
+        loading={loading}
+      />
+    </Box>
+  );
+};
+
+export default AdminUsersTab;
diff --git a/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx b/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx
new file mode 100644
index 0000000..8de5f2f
--- /dev/null
+++ b/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import {
+  Table,
+  Group,
+  Text,
+  ActionIcon,
+  Box,
+  LoadingOverlay,
+  Alert,
+} from '@mantine/core';
+import { IconTrash, IconEdit, IconAlertCircle } from '@tabler/icons-react';
+import { useAdmin } from '../../../hooks/useAdmin';
+
+const AdminWorkspacesTab = () => {
+  const { data: workspaces, loading, error } = useAdmin('workspaces');
+
+  const rows = workspaces.map((workspace) => (
+    <Table.Tr key={workspace.id}>
+      <Table.Td>{workspace.name}</Table.Td>
+      <Table.Td>{workspace.owner?.email}</Table.Td>
+      <Table.Td>{new Date(workspace.createdAt).toLocaleDateString()}</Table.Td>
+      <Table.Td>{workspace.gitEnabled ? 'Yes' : 'No'}</Table.Td>
+      <Table.Td>
+        <Group gap="xs" justify="flex-end">
+          <ActionIcon variant="subtle" color="blue">
+            <IconEdit size={16} />
+          </ActionIcon>
+          <ActionIcon variant="subtle" color="red">
+            <IconTrash size={16} />
+          </ActionIcon>
+        </Group>
+      </Table.Td>
+    </Table.Tr>
+  ));
+
+  return (
+    <Box pos="relative">
+      <LoadingOverlay visible={loading} />
+
+      {error && (
+        <Alert
+          icon={<IconAlertCircle size={16} />}
+          title="Error"
+          color="red"
+          mb="md"
+        >
+          {error}
+        </Alert>
+      )}
+
+      <Group justify="space-between" mb="md">
+        <Text size="xl" fw={700}>
+          Workspace Management
+        </Text>
+      </Group>
+
+      <Table striped highlightOnHover withTableBorder>
+        <Table.Thead>
+          <Table.Tr>
+            <Table.Th>Name</Table.Th>
+            <Table.Th>Owner</Table.Th>
+            <Table.Th>Created At</Table.Th>
+            <Table.Th>Git Enabled</Table.Th>
+            <Table.Th style={{ width: 100 }}>Actions</Table.Th>
+          </Table.Tr>
+        </Table.Thead>
+        <Table.Tbody>{rows}</Table.Tbody>
+      </Table>
+    </Box>
+  );
+};
+
+export default AdminWorkspacesTab;
diff --git a/frontend/src/components/settings/admin/StatCard.jsx b/frontend/src/components/settings/admin/StatCard.jsx
new file mode 100644
index 0000000..9a2a379
--- /dev/null
+++ b/frontend/src/components/settings/admin/StatCard.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { Card, Group, Box, Text } from '@mantine/core';
+
+const StatCard = ({ title, value, icon: Icon, color = 'blue' }) => (
+  <Card withBorder p="md">
+    <Group>
+      <Box style={{ flex: 1 }}>
+        <Text size="xs" tt="uppercase" fw={700} c="dimmed">
+          {title}
+        </Text>
+        <Text fw={700} size="xl">
+          {value}
+        </Text>
+      </Box>
+      <Icon size={32} color={`var(--mantine-color-${color}-filled)`} />
+    </Group>
+  </Card>
+);
+
+export default StatCard;
diff --git a/frontend/src/services/adminApi.js b/frontend/src/services/adminApi.js
index 3c6c4a0..3c3bec3 100644
--- a/frontend/src/services/adminApi.js
+++ b/frontend/src/services/adminApi.js
@@ -21,7 +21,11 @@ export const deleteUser = async (userId) => {
   const response = await apiCall(`${ADMIN_BASE_URL}/users/${userId}`, {
     method: 'DELETE',
   });
-  return response.json();
+  if (response.status === 204) {
+    return;
+  } else {
+    throw new Error('Failed to delete user with status: ', response.status);
+  }
 };
 
 export const updateUser = async (userId, userData) => {

From ebf32e775cf18cf2198d3a0afa2f05b5fdcda5a5 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Fri, 8 Nov 2024 23:58:57 +0100
Subject: [PATCH 05/11] Remove not working stats

---
 backend/internal/db/admin.go                  | 12 -------
 .../settings/admin/AdminStatsTab.jsx          | 35 +------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/backend/internal/db/admin.go b/backend/internal/db/admin.go
index 3b8432d..da217f2 100644
--- a/backend/internal/db/admin.go
+++ b/backend/internal/db/admin.go
@@ -8,8 +8,6 @@ type SystemStats struct {
 	TotalUsers      int `json:"totalUsers"`
 	TotalWorkspaces int `json:"totalWorkspaces"`
 	ActiveUsers     int `json:"activeUsers"` // Users with activity in last 30 days
-	StorageUsed     int `json:"storageUsed"` // Total storage used in bytes
-	TotalFiles      int `json:"totalFiles"`  // Total number of files across all workspaces
 }
 
 // GetAllUsers returns a list of all users in the system
@@ -66,15 +64,5 @@ func (db *DB) GetSystemStats() (*SystemStats, error) {
 		return nil, err
 	}
 
-	// Get total files and storage used
-	// Note: This assumes you're tracking file sizes in your filesystem
-	err = db.QueryRow(`
-		SELECT COUNT(*), COALESCE(SUM(size), 0) 
-		FROM files`).
-		Scan(&stats.TotalFiles, &stats.StorageUsed)
-	if err != nil {
-		return nil, err
-	}
-
 	return stats, nil
 }
diff --git a/frontend/src/components/settings/admin/AdminStatsTab.jsx b/frontend/src/components/settings/admin/AdminStatsTab.jsx
index 31c13eb..6950c8b 100644
--- a/frontend/src/components/settings/admin/AdminStatsTab.jsx
+++ b/frontend/src/components/settings/admin/AdminStatsTab.jsx
@@ -9,27 +9,10 @@ import {
   Alert,
   RingProgress,
 } from '@mantine/core';
-import {
-  IconUsers,
-  IconFolders,
-  IconServer,
-  IconFiles,
-  IconAlertCircle,
-} from '@tabler/icons-react';
+import { IconUsers, IconFolders, IconAlertCircle } from '@tabler/icons-react';
 import { useAdmin } from '../../../hooks/useAdmin';
 import StatCard from './StatCard';
 
-const formatBytes = (bytes) => {
-  const units = ['B', 'KB', 'MB', 'GB'];
-  let size = bytes;
-  let unitIndex = 0;
-  while (size >= 1024 && unitIndex < units.length - 1) {
-    size /= 1024;
-    unitIndex++;
-  }
-  return `${size.toFixed(1)} ${units[unitIndex]}`;
-};
-
 const AdminStatsTab = () => {
   const { data: stats, loading, error } = useAdmin('stats');
 
@@ -68,22 +51,6 @@ const AdminStatsTab = () => {
             color="grape"
           />
         </Grid.Col>
-        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
-          <StatCard
-            title="Storage Used"
-            value={formatBytes(stats.storageUsed)}
-            icon={IconServer}
-            color="teal"
-          />
-        </Grid.Col>
-        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
-          <StatCard
-            title="Total Files"
-            value={stats.totalFiles}
-            icon={IconFiles}
-            color="orange"
-          />
-        </Grid.Col>
       </Grid>
 
       <Grid mt="md">

From 9688b2d5284b06a79ab91fdfaffd61549146e9f8 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Sat, 9 Nov 2024 21:59:04 +0100
Subject: [PATCH 06/11] Split filesystem.go file

---
 backend/internal/filesystem/files.go      | 153 +++++++++++++++
 backend/internal/filesystem/filesystem.go | 220 +---------------------
 backend/internal/filesystem/git.go        |  60 ++++++
 backend/internal/filesystem/workspace.go  |  40 ++++
 4 files changed, 256 insertions(+), 217 deletions(-)
 create mode 100644 backend/internal/filesystem/files.go
 create mode 100644 backend/internal/filesystem/git.go
 create mode 100644 backend/internal/filesystem/workspace.go

diff --git a/backend/internal/filesystem/files.go b/backend/internal/filesystem/files.go
new file mode 100644
index 0000000..152e284
--- /dev/null
+++ b/backend/internal/filesystem/files.go
@@ -0,0 +1,153 @@
+// Package filesystem provides functionalities to interact with the file system,
+// including listing files, finding files by name, getting file content, saving files, and deleting files.
+package filesystem
+
+import (
+	"errors"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+)
+
+// FileNode represents a file or directory in the file system.
+type FileNode struct {
+	ID       string     `json:"id"`
+	Name     string     `json:"name"`
+	Path     string     `json:"path"`
+	Children []FileNode `json:"children,omitempty"`
+}
+
+// ListFilesRecursively returns a list of all files in the workspace directory and its subdirectories.
+func (fs *FileSystem) ListFilesRecursively(userID, workspaceID int) ([]FileNode, error) {
+	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
+	return fs.walkDirectory(workspacePath, "")
+}
+
+func (fs *FileSystem) walkDirectory(dir, prefix string) ([]FileNode, error) {
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return nil, err
+	}
+
+	// Split entries into directories and files
+	var dirs, files []os.DirEntry
+	for _, entry := range entries {
+		if entry.IsDir() {
+			dirs = append(dirs, entry)
+		} else {
+			files = append(files, entry)
+		}
+	}
+
+	// Sort directories and files separately
+	sort.Slice(dirs, func(i, j int) bool {
+		return strings.ToLower(dirs[i].Name()) < strings.ToLower(dirs[j].Name())
+	})
+	sort.Slice(files, func(i, j int) bool {
+		return strings.ToLower(files[i].Name()) < strings.ToLower(files[j].Name())
+	})
+
+	// Create combined slice with directories first, then files
+	nodes := make([]FileNode, 0, len(entries))
+
+	// Add directories first
+	for _, entry := range dirs {
+		name := entry.Name()
+		path := filepath.Join(prefix, name)
+		fullPath := filepath.Join(dir, name)
+
+		children, err := fs.walkDirectory(fullPath, path)
+		if err != nil {
+			return nil, err
+		}
+
+		node := FileNode{
+			ID:       path,
+			Name:     name,
+			Path:     path,
+			Children: children,
+		}
+		nodes = append(nodes, node)
+	}
+
+	// Then add files
+	for _, entry := range files {
+		name := entry.Name()
+		path := filepath.Join(prefix, name)
+
+		node := FileNode{
+			ID:   path,
+			Name: name,
+			Path: path,
+		}
+		nodes = append(nodes, node)
+	}
+
+	return nodes, nil
+}
+
+// FindFileByName returns a list of file paths that match the given filename.
+func (fs *FileSystem) FindFileByName(userID, workspaceID int, filename string) ([]string, error) {
+	var foundPaths []string
+	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
+
+	err := filepath.Walk(workspacePath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() {
+			relPath, err := filepath.Rel(workspacePath, path)
+			if err != nil {
+				return err
+			}
+			if strings.EqualFold(info.Name(), filename) {
+				foundPaths = append(foundPaths, relPath)
+			}
+		}
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if len(foundPaths) == 0 {
+		return nil, errors.New("file not found")
+	}
+
+	return foundPaths, nil
+}
+
+// GetFileContent returns the content of the file at the given path.
+func (fs *FileSystem) GetFileContent(userID, workspaceID int, filePath string) ([]byte, error) {
+	fullPath, err := fs.ValidatePath(userID, workspaceID, filePath)
+	if err != nil {
+		return nil, err
+	}
+	return os.ReadFile(fullPath)
+}
+
+// SaveFile writes the content to the file at the given path.
+func (fs *FileSystem) SaveFile(userID, workspaceID int, filePath string, content []byte) error {
+	fullPath, err := fs.ValidatePath(userID, workspaceID, filePath)
+	if err != nil {
+		return err
+	}
+
+	dir := filepath.Dir(fullPath)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return err
+	}
+
+	return os.WriteFile(fullPath, content, 0644)
+}
+
+// DeleteFile deletes the file at the given path.
+func (fs *FileSystem) DeleteFile(userID, workspaceID int, filePath string) error {
+	fullPath, err := fs.ValidatePath(userID, workspaceID, filePath)
+	if err != nil {
+		return err
+	}
+	return os.Remove(fullPath)
+}
diff --git a/backend/internal/filesystem/filesystem.go b/backend/internal/filesystem/filesystem.go
index 38e29c1..87ba6b2 100644
--- a/backend/internal/filesystem/filesystem.go
+++ b/backend/internal/filesystem/filesystem.go
@@ -1,27 +1,19 @@
 package filesystem
 
 import (
-	"errors"
 	"fmt"
 	"novamd/internal/gitutils"
-	"os"
 	"path/filepath"
-	"sort"
 	"strings"
 )
 
+// FileSystem represents the file system structure.
 type FileSystem struct {
 	RootDir  string
 	GitRepos map[int]map[int]*gitutils.GitRepo // map[userID]map[workspaceID]*gitutils.GitRepo
 }
 
-type FileNode struct {
-	ID       string     `json:"id"`
-	Name     string     `json:"name"`
-	Path     string     `json:"path"`
-	Children []FileNode `json:"children,omitempty"`
-}
-
+// New creates a new FileSystem instance.
 func New(rootDir string) *FileSystem {
 	return &FileSystem{
 		RootDir:  rootDir,
@@ -29,30 +21,7 @@ func New(rootDir string) *FileSystem {
 	}
 }
 
-func (fs *FileSystem) GetWorkspacePath(userID, workspaceID int) string {
-	return filepath.Join(fs.RootDir, fmt.Sprintf("%d", userID), fmt.Sprintf("%d", workspaceID))
-}
-
-func (fs *FileSystem) InitializeUserWorkspace(userID, workspaceID int) error {
-	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
-	err := os.MkdirAll(workspacePath, 0755)
-	if err != nil {
-		return fmt.Errorf("failed to create workspace directory: %w", err)
-	}
-
-	return nil
-}
-
-func (fs *FileSystem) DeleteUserWorkspace(userID, workspaceID int) error {
-	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
-	err := os.RemoveAll(workspacePath)
-	if err != nil {
-		return fmt.Errorf("failed to delete workspace directory: %w", err)
-	}
-
-	return nil
-}
-
+// ValidatePath validates the given path and returns the cleaned path if it is valid.
 func (fs *FileSystem) ValidatePath(userID, workspaceID int, path string) (string, error) {
 	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
 	fullPath := filepath.Join(workspacePath, path)
@@ -64,186 +33,3 @@ func (fs *FileSystem) ValidatePath(userID, workspaceID int, path string) (string
 
 	return cleanPath, nil
 }
-
-func (fs *FileSystem) ListFilesRecursively(userID, workspaceID int) ([]FileNode, error) {
-	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
-	return fs.walkDirectory(workspacePath, "")
-}
-
-func (fs *FileSystem) walkDirectory(dir, prefix string) ([]FileNode, error) {
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	// Split entries into directories and files
-	var dirs, files []os.DirEntry
-	for _, entry := range entries {
-		if entry.IsDir() {
-			dirs = append(dirs, entry)
-		} else {
-			files = append(files, entry)
-		}
-	}
-
-	// Sort directories and files separately
-	sort.Slice(dirs, func(i, j int) bool {
-		return strings.ToLower(dirs[i].Name()) < strings.ToLower(dirs[j].Name())
-	})
-	sort.Slice(files, func(i, j int) bool {
-		return strings.ToLower(files[i].Name()) < strings.ToLower(files[j].Name())
-	})
-
-	// Create combined slice with directories first, then files
-	nodes := make([]FileNode, 0, len(entries))
-
-	// Add directories first
-	for _, entry := range dirs {
-		name := entry.Name()
-		path := filepath.Join(prefix, name)
-		fullPath := filepath.Join(dir, name)
-
-		children, err := fs.walkDirectory(fullPath, path)
-		if err != nil {
-			return nil, err
-		}
-
-		node := FileNode{
-			ID:       path,
-			Name:     name,
-			Path:     path,
-			Children: children,
-		}
-		nodes = append(nodes, node)
-	}
-
-	// Then add files
-	for _, entry := range files {
-		name := entry.Name()
-		path := filepath.Join(prefix, name)
-
-		node := FileNode{
-			ID:   path,
-			Name: name,
-			Path: path,
-		}
-		nodes = append(nodes, node)
-	}
-
-	return nodes, nil
-}
-
-func (fs *FileSystem) FindFileByName(userID, workspaceID int, filename string) ([]string, error) {
-	var foundPaths []string
-	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
-
-	err := filepath.Walk(workspacePath, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.IsDir() {
-			relPath, err := filepath.Rel(workspacePath, path)
-			if err != nil {
-				return err
-			}
-			if strings.EqualFold(info.Name(), filename) {
-				foundPaths = append(foundPaths, relPath)
-			}
-		}
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	if len(foundPaths) == 0 {
-		return nil, errors.New("file not found")
-	}
-
-	return foundPaths, nil
-}
-
-func (fs *FileSystem) GetFileContent(userID, workspaceID int, filePath string) ([]byte, error) {
-	fullPath, err := fs.ValidatePath(userID, workspaceID, filePath)
-	if err != nil {
-		return nil, err
-	}
-	return os.ReadFile(fullPath)
-}
-
-func (fs *FileSystem) SaveFile(userID, workspaceID int, filePath string, content []byte) error {
-	fullPath, err := fs.ValidatePath(userID, workspaceID, filePath)
-	if err != nil {
-		return err
-	}
-
-	dir := filepath.Dir(fullPath)
-	if err := os.MkdirAll(dir, 0755); err != nil {
-		return err
-	}
-
-	return os.WriteFile(fullPath, content, 0644)
-}
-
-func (fs *FileSystem) DeleteFile(userID, workspaceID int, filePath string) error {
-	fullPath, err := fs.ValidatePath(userID, workspaceID, filePath)
-	if err != nil {
-		return err
-	}
-	return os.Remove(fullPath)
-}
-
-func (fs *FileSystem) CreateWorkspaceDirectory(userID, workspaceID int) error {
-	dir := fs.GetWorkspacePath(userID, workspaceID)
-	return os.MkdirAll(dir, 0755)
-}
-
-func (fs *FileSystem) SetupGitRepo(userID, workspaceID int, gitURL, gitUser, gitToken string) error {
-	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
-	if _, ok := fs.GitRepos[userID]; !ok {
-		fs.GitRepos[userID] = make(map[int]*gitutils.GitRepo)
-	}
-	fs.GitRepos[userID][workspaceID] = gitutils.New(gitURL, gitUser, gitToken, workspacePath)
-	return fs.GitRepos[userID][workspaceID].EnsureRepo()
-}
-
-func (fs *FileSystem) DisableGitRepo(userID, workspaceID int) {
-	if userRepos, ok := fs.GitRepos[userID]; ok {
-		delete(userRepos, workspaceID)
-		if len(userRepos) == 0 {
-			delete(fs.GitRepos, userID)
-		}
-	}
-}
-
-func (fs *FileSystem) StageCommitAndPush(userID, workspaceID int, message string) error {
-	repo, ok := fs.getGitRepo(userID, workspaceID)
-	if !ok {
-		return errors.New("git settings not configured for this workspace")
-	}
-
-	if err := repo.Commit(message); err != nil {
-		return err
-	}
-
-	return repo.Push()
-}
-
-func (fs *FileSystem) Pull(userID, workspaceID int) error {
-	repo, ok := fs.getGitRepo(userID, workspaceID)
-	if !ok {
-		return errors.New("git settings not configured for this workspace")
-	}
-
-	return repo.Pull()
-}
-
-func (fs *FileSystem) getGitRepo(userID, workspaceID int) (*gitutils.GitRepo, bool) {
-	userRepos, ok := fs.GitRepos[userID]
-	if !ok {
-		return nil, false
-	}
-	repo, ok := userRepos[workspaceID]
-	return repo, ok
-}
diff --git a/backend/internal/filesystem/git.go b/backend/internal/filesystem/git.go
new file mode 100644
index 0000000..6c97a6f
--- /dev/null
+++ b/backend/internal/filesystem/git.go
@@ -0,0 +1,60 @@
+package filesystem
+
+import (
+	"errors"
+	"novamd/internal/gitutils"
+)
+
+// SetupGitRepo sets up a Git repository for the given user and workspace IDs.
+func (fs *FileSystem) SetupGitRepo(userID, workspaceID int, gitURL, gitUser, gitToken string) error {
+	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
+	if _, ok := fs.GitRepos[userID]; !ok {
+		fs.GitRepos[userID] = make(map[int]*gitutils.GitRepo)
+	}
+	fs.GitRepos[userID][workspaceID] = gitutils.New(gitURL, gitUser, gitToken, workspacePath)
+	return fs.GitRepos[userID][workspaceID].EnsureRepo()
+}
+
+// DisableGitRepo disables the Git repository for the given user and workspace IDs.
+func (fs *FileSystem) DisableGitRepo(userID, workspaceID int) {
+	if userRepos, ok := fs.GitRepos[userID]; ok {
+		delete(userRepos, workspaceID)
+		if len(userRepos) == 0 {
+			delete(fs.GitRepos, userID)
+		}
+	}
+}
+
+// StageCommitAndPush stages, commits, and pushes the changes to the Git repository.
+func (fs *FileSystem) StageCommitAndPush(userID, workspaceID int, message string) error {
+	repo, ok := fs.getGitRepo(userID, workspaceID)
+	if !ok {
+		return errors.New("git settings not configured for this workspace")
+	}
+
+	if err := repo.Commit(message); err != nil {
+		return err
+	}
+
+	return repo.Push()
+}
+
+// Pull pulls the changes from the remote Git repository.
+func (fs *FileSystem) Pull(userID, workspaceID int) error {
+	repo, ok := fs.getGitRepo(userID, workspaceID)
+	if !ok {
+		return errors.New("git settings not configured for this workspace")
+	}
+
+	return repo.Pull()
+}
+
+// getGitRepo returns the Git repository for the given user and workspace IDs.
+func (fs *FileSystem) getGitRepo(userID, workspaceID int) (*gitutils.GitRepo, bool) {
+	userRepos, ok := fs.GitRepos[userID]
+	if !ok {
+		return nil, false
+	}
+	repo, ok := userRepos[workspaceID]
+	return repo, ok
+}
diff --git a/backend/internal/filesystem/workspace.go b/backend/internal/filesystem/workspace.go
new file mode 100644
index 0000000..122c816
--- /dev/null
+++ b/backend/internal/filesystem/workspace.go
@@ -0,0 +1,40 @@
+package filesystem
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+// GetWorkspacePath returns the path to the workspace directory for the given user and workspace IDs.
+func (fs *FileSystem) GetWorkspacePath(userID, workspaceID int) string {
+	return filepath.Join(fs.RootDir, fmt.Sprintf("%d", userID), fmt.Sprintf("%d", workspaceID))
+}
+
+// InitializeUserWorkspace creates the workspace directory for the given user and workspace IDs.
+func (fs *FileSystem) InitializeUserWorkspace(userID, workspaceID int) error {
+	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
+	err := os.MkdirAll(workspacePath, 0755)
+	if err != nil {
+		return fmt.Errorf("failed to create workspace directory: %w", err)
+	}
+
+	return nil
+}
+
+// DeleteUserWorkspace deletes the workspace directory for the given user and workspace IDs.
+func (fs *FileSystem) DeleteUserWorkspace(userID, workspaceID int) error {
+	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
+	err := os.RemoveAll(workspacePath)
+	if err != nil {
+		return fmt.Errorf("failed to delete workspace directory: %w", err)
+	}
+
+	return nil
+}
+
+// CreateWorkspaceDirectory creates the workspace directory for the given user and workspace IDs.
+func (fs *FileSystem) CreateWorkspaceDirectory(userID, workspaceID int) error {
+	dir := fs.GetWorkspacePath(userID, workspaceID)
+	return os.MkdirAll(dir, 0755)
+}

From 7b1da94e8a492fa78bb20377e215d7704844bc84 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Sat, 9 Nov 2024 23:11:23 +0100
Subject: [PATCH 07/11] Implement file system stats

---
 backend/internal/db/admin.go                |  8 +--
 backend/internal/filesystem/files.go        | 66 +++++++++++++++++++++
 backend/internal/filesystem/filesystem.go   |  5 ++
 backend/internal/handlers/admin_handlers.go | 27 +++++++--
 4 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/backend/internal/db/admin.go b/backend/internal/db/admin.go
index da217f2..15c8a84 100644
--- a/backend/internal/db/admin.go
+++ b/backend/internal/db/admin.go
@@ -3,8 +3,8 @@ package db
 
 import "novamd/internal/models"
 
-// SystemStats represents system-wide statistics
-type SystemStats struct {
+// UserStats represents system-wide statistics
+type UserStats struct {
 	TotalUsers      int `json:"totalUsers"`
 	TotalWorkspaces int `json:"totalWorkspaces"`
 	ActiveUsers     int `json:"activeUsers"` // Users with activity in last 30 days
@@ -39,8 +39,8 @@ func (db *DB) GetAllUsers() ([]*models.User, error) {
 }
 
 // GetSystemStats returns system-wide statistics
-func (db *DB) GetSystemStats() (*SystemStats, error) {
-	stats := &SystemStats{}
+func (db *DB) GetSystemStats() (*UserStats, error) {
+	stats := &UserStats{}
 
 	// Get total users
 	err := db.QueryRow("SELECT COUNT(*) FROM users").Scan(&stats.TotalUsers)
diff --git a/backend/internal/filesystem/files.go b/backend/internal/filesystem/files.go
index 152e284..3857708 100644
--- a/backend/internal/filesystem/files.go
+++ b/backend/internal/filesystem/files.go
@@ -4,6 +4,7 @@ package filesystem
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 	"sort"
@@ -151,3 +152,68 @@ func (fs *FileSystem) DeleteFile(userID, workspaceID int, filePath string) error
 	}
 	return os.Remove(fullPath)
 }
+
+// FileCountStats holds statistics about files in a workspace
+type FileCountStats struct {
+	TotalFiles int   `json:"totalFiles"`
+	TotalSize  int64 `json:"totalSize"`
+}
+
+// GetFileStats returns the total number of files and related statistics in a workspace
+// Parameters:
+// - userID: the ID of the user who owns the workspace
+// - workspaceID: the ID of the workspace to count files in
+// Returns:
+// - result: statistics about the files in the workspace
+// - error: any error that occurred during counting
+func (fs *FileSystem) GetFileStats(userID, workspaceID int) (*FileCountStats, error) {
+	workspacePath := fs.GetWorkspacePath(userID, workspaceID)
+
+	// Check if workspace exists
+	if _, err := os.Stat(workspacePath); os.IsNotExist(err) {
+		return nil, errors.New("workspace directory does not exist")
+	}
+
+	return fs.countFilesInPath(workspacePath)
+
+}
+
+func (fs *FileSystem) countFilesInPath(directoryPath string) (*FileCountStats, error) {
+	result := &FileCountStats{}
+
+	err := filepath.WalkDir(directoryPath, func(path string, d os.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Skip the .git directory
+		if d.IsDir() && d.Name() == ".git" {
+			return filepath.SkipDir
+		}
+
+		// Only count regular files
+		if !d.IsDir() {
+			// Get relative path from workspace root
+			relPath, err := filepath.Rel(directoryPath, path)
+			if err != nil {
+				return fmt.Errorf("failed to get relative path: %w", err)
+			}
+
+			// Get file info for size
+			info, err := d.Info()
+			if err != nil {
+				return fmt.Errorf("failed to get file info for %s: %w", relPath, err)
+			}
+
+			result.TotalFiles++
+			result.TotalSize += info.Size()
+		}
+		return nil
+	})
+
+	if err != nil {
+		return nil, fmt.Errorf("error counting files: %w", err)
+	}
+
+	return result, nil
+}
diff --git a/backend/internal/filesystem/filesystem.go b/backend/internal/filesystem/filesystem.go
index 87ba6b2..35f5637 100644
--- a/backend/internal/filesystem/filesystem.go
+++ b/backend/internal/filesystem/filesystem.go
@@ -33,3 +33,8 @@ func (fs *FileSystem) ValidatePath(userID, workspaceID int, path string) (string
 
 	return cleanPath, nil
 }
+
+// GetTotalFileStats returns the total file statistics for the file system.
+func (fs *FileSystem) GetTotalFileStats() (*FileCountStats, error) {
+	return fs.countFilesInPath(fs.RootDir)
+}
diff --git a/backend/internal/handlers/admin_handlers.go b/backend/internal/handlers/admin_handlers.go
index 4c78ed1..69ba0c6 100644
--- a/backend/internal/handlers/admin_handlers.go
+++ b/backend/internal/handlers/admin_handlers.go
@@ -3,6 +3,8 @@ package handlers
 import (
 	"encoding/json"
 	"net/http"
+	"novamd/internal/db"
+	"novamd/internal/filesystem"
 	"novamd/internal/httpcontext"
 	"novamd/internal/models"
 	"strconv"
@@ -27,7 +29,7 @@ type UpdateUserRequest struct {
 
 // AdminListUsers returns a list of all users
 func (h *Handler) AdminListUsers() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, _ *http.Request) {
 		users, err := h.DB.GetAllUsers()
 		if err != nil {
 			http.Error(w, "Failed to list users", http.StatusInternalServerError)
@@ -202,15 +204,32 @@ func (h *Handler) AdminDeleteUser() http.HandlerFunc {
 	}
 }
 
+// SystemStats holds system-wide statistics
+type SystemStats struct {
+	*db.UserStats
+	*filesystem.FileCountStats
+}
+
 // AdminGetSystemStats returns system-wide statistics for admins
 func (h *Handler) AdminGetSystemStats() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		stats, err := h.DB.GetSystemStats()
+	return func(w http.ResponseWriter, _ *http.Request) {
+		userStats, err := h.DB.GetSystemStats()
 		if err != nil {
-			http.Error(w, "Failed to get system stats", http.StatusInternalServerError)
+			http.Error(w, "Failed to get user stats", http.StatusInternalServerError)
 			return
 		}
 
+		fileStats, err := h.FS.GetTotalFileStats()
+		if err != nil {
+			http.Error(w, "Failed to get file stats", http.StatusInternalServerError)
+			return
+		}
+
+		stats := &SystemStats{
+			UserStats:      userStats,
+			FileCountStats: fileStats,
+		}
+
 		respondJSON(w, stats)
 	}
 }

From 118591df62078270b534232736cef2f867e4c97b Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Sat, 9 Nov 2024 23:12:52 +0100
Subject: [PATCH 08/11] Unify errors

---
 backend/internal/crypto/crypto.go    | 7 +++----
 backend/internal/filesystem/files.go | 5 ++---
 backend/internal/filesystem/git.go   | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backend/internal/crypto/crypto.go b/backend/internal/crypto/crypto.go
index 1b08245..76cf338 100644
--- a/backend/internal/crypto/crypto.go
+++ b/backend/internal/crypto/crypto.go
@@ -5,14 +5,13 @@ import (
 	"crypto/cipher"
 	"crypto/rand"
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"io"
 )
 
 var (
-	ErrKeyRequired    = errors.New("encryption key is required")
-	ErrInvalidKeySize = errors.New("encryption key must be 32 bytes (256 bits) when decoded")
+	ErrKeyRequired    = fmt.Errorf("encryption key is required")
+	ErrInvalidKeySize = fmt.Errorf("encryption key must be 32 bytes (256 bits) when decoded")
 )
 
 type Crypto struct {
@@ -102,7 +101,7 @@ func (c *Crypto) Decrypt(ciphertext string) (string, error) {
 
 	nonceSize := gcm.NonceSize()
 	if len(data) < nonceSize {
-		return "", errors.New("ciphertext too short")
+		return "", fmt.Errorf("ciphertext too short")
 	}
 
 	nonce, ciphertextBytes := data[:nonceSize], data[nonceSize:]
diff --git a/backend/internal/filesystem/files.go b/backend/internal/filesystem/files.go
index 3857708..9b876d8 100644
--- a/backend/internal/filesystem/files.go
+++ b/backend/internal/filesystem/files.go
@@ -3,7 +3,6 @@
 package filesystem
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -114,7 +113,7 @@ func (fs *FileSystem) FindFileByName(userID, workspaceID int, filename string) (
 	}
 
 	if len(foundPaths) == 0 {
-		return nil, errors.New("file not found")
+		return nil, fmt.Errorf("file not found")
 	}
 
 	return foundPaths, nil
@@ -171,7 +170,7 @@ func (fs *FileSystem) GetFileStats(userID, workspaceID int) (*FileCountStats, er
 
 	// Check if workspace exists
 	if _, err := os.Stat(workspacePath); os.IsNotExist(err) {
-		return nil, errors.New("workspace directory does not exist")
+		return nil, fmt.Errorf("workspace directory does not exist")
 	}
 
 	return fs.countFilesInPath(workspacePath)
diff --git a/backend/internal/filesystem/git.go b/backend/internal/filesystem/git.go
index 6c97a6f..de83ad9 100644
--- a/backend/internal/filesystem/git.go
+++ b/backend/internal/filesystem/git.go
@@ -1,7 +1,7 @@
 package filesystem
 
 import (
-	"errors"
+	"fmt"
 	"novamd/internal/gitutils"
 )
 
@@ -29,7 +29,7 @@ func (fs *FileSystem) DisableGitRepo(userID, workspaceID int) {
 func (fs *FileSystem) StageCommitAndPush(userID, workspaceID int, message string) error {
 	repo, ok := fs.getGitRepo(userID, workspaceID)
 	if !ok {
-		return errors.New("git settings not configured for this workspace")
+		return fmt.Errorf("git settings not configured for this workspace")
 	}
 
 	if err := repo.Commit(message); err != nil {
@@ -43,7 +43,7 @@ func (fs *FileSystem) StageCommitAndPush(userID, workspaceID int, message string
 func (fs *FileSystem) Pull(userID, workspaceID int) error {
 	repo, ok := fs.getGitRepo(userID, workspaceID)
 	if !ok {
-		return errors.New("git settings not configured for this workspace")
+		return fmt.Errorf("git settings not configured for this workspace")
 	}
 
 	return repo.Pull()

From 33bc28560f13dfb511feb50b65a668988470c2a5 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Sat, 9 Nov 2024 23:33:07 +0100
Subject: [PATCH 09/11] Update admin stats

---
 .../settings/admin/AdminStatsTab.jsx          | 103 +++++++-----------
 .../components/settings/admin/StatCard.jsx    |  20 ----
 2 files changed, 40 insertions(+), 83 deletions(-)
 delete mode 100644 frontend/src/components/settings/admin/StatCard.jsx

diff --git a/frontend/src/components/settings/admin/AdminStatsTab.jsx b/frontend/src/components/settings/admin/AdminStatsTab.jsx
index 6950c8b..b8564da 100644
--- a/frontend/src/components/settings/admin/AdminStatsTab.jsx
+++ b/frontend/src/components/settings/admin/AdminStatsTab.jsx
@@ -1,17 +1,18 @@
 import React from 'react';
-import {
-  Grid,
-  Card,
-  Stack,
-  Text,
-  Title,
-  LoadingOverlay,
-  Alert,
-  RingProgress,
-} from '@mantine/core';
-import { IconUsers, IconFolders, IconAlertCircle } from '@tabler/icons-react';
+import { Table, Text, Box, LoadingOverlay, Alert } from '@mantine/core';
+import { IconAlertCircle } from '@tabler/icons-react';
 import { useAdmin } from '../../../hooks/useAdmin';
-import StatCard from './StatCard';
+
+const formatBytes = (bytes) => {
+  const units = ['B', 'KB', 'MB', 'GB'];
+  let size = bytes;
+  let unitIndex = 0;
+  while (size >= 1024 && unitIndex < units.length - 1) {
+    size /= 1024;
+    unitIndex++;
+  }
+  return `${size.toFixed(1)} ${units[unitIndex]}`;
+};
 
 const AdminStatsTab = () => {
   const { data: stats, loading, error } = useAdmin('stats');
@@ -28,61 +29,37 @@ const AdminStatsTab = () => {
     );
   }
 
+  const statsRows = [
+    { label: 'Total Users', value: stats.totalUsers },
+    { label: 'Active Users', value: stats.activeUsers },
+    { label: 'Total Workspaces', value: stats.totalWorkspaces },
+    { label: 'Total Files', value: stats.totalFiles },
+    { label: 'Total Storage Size', value: formatBytes(stats.totalSize) },
+  ];
+
   return (
-    <Stack>
-      <Text size="xl" fw={700}>
+    <Box pos="relative">
+      <Text size="xl" fw={700} mb="md">
         System Statistics
       </Text>
 
-      <Grid>
-        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
-          <StatCard
-            title="Total Users"
-            value={stats.totalUsers}
-            icon={IconUsers}
-            color="blue"
-          />
-        </Grid.Col>
-        <Grid.Col span={{ base: 12, md: 6, lg: 3 }}>
-          <StatCard
-            title="Total Workspaces"
-            value={stats.totalWorkspaces}
-            icon={IconFolders}
-            color="grape"
-          />
-        </Grid.Col>
-      </Grid>
-
-      <Grid mt="md">
-        <Grid.Col span={{ base: 12, md: 6 }}>
-          <Card withBorder>
-            <Stack align="center">
-              <Title order={3}>Active Users</Title>
-              <RingProgress
-                size={200}
-                thickness={16}
-                roundCaps
-                sections={[
-                  {
-                    value: (stats.activeUsers / stats.totalUsers) * 100,
-                    color: 'blue',
-                  },
-                ]}
-                label={
-                  <Text ta="center" fw={700} size="xl">
-                    {((stats.activeUsers / stats.totalUsers) * 100).toFixed(1)}%
-                  </Text>
-                }
-              />
-              <Text c="dimmed" size="sm">
-                {stats.activeUsers} out of {stats.totalUsers} users active in
-                last 30 days
-              </Text>
-            </Stack>
-          </Card>
-        </Grid.Col>
-      </Grid>
-    </Stack>
+      <Table striped highlightOnHover withBorder>
+        <Table.Thead>
+          <Table.Tr>
+            <Table.Th>Metric</Table.Th>
+            <Table.Th>Value</Table.Th>
+          </Table.Tr>
+        </Table.Thead>
+        <Table.Tbody>
+          {statsRows.map((row) => (
+            <Table.Tr key={row.label}>
+              <Table.Td>{row.label}</Table.Td>
+              <Table.Td>{row.value}</Table.Td>
+            </Table.Tr>
+          ))}
+        </Table.Tbody>
+      </Table>
+    </Box>
   );
 };
 
diff --git a/frontend/src/components/settings/admin/StatCard.jsx b/frontend/src/components/settings/admin/StatCard.jsx
deleted file mode 100644
index 9a2a379..0000000
--- a/frontend/src/components/settings/admin/StatCard.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { Card, Group, Box, Text } from '@mantine/core';
-
-const StatCard = ({ title, value, icon: Icon, color = 'blue' }) => (
-  <Card withBorder p="md">
-    <Group>
-      <Box style={{ flex: 1 }}>
-        <Text size="xs" tt="uppercase" fw={700} c="dimmed">
-          {title}
-        </Text>
-        <Text fw={700} size="xl">
-          {value}
-        </Text>
-      </Box>
-      <Icon size={32} color={`var(--mantine-color-${color}-filled)`} />
-    </Group>
-  </Card>
-);
-
-export default StatCard;

From 148001be433d281c5d0bda2e513d54245768054d Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Sun, 10 Nov 2024 00:05:32 +0100
Subject: [PATCH 10/11] Implement admin edit user

---
 .../components/modals/user/EditUserModal.jsx  | 105 ++++++++++++++++++
 .../settings/admin/AdminUsersTab.jsx          |  22 +++-
 2 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/modals/user/EditUserModal.jsx

diff --git a/frontend/src/components/modals/user/EditUserModal.jsx b/frontend/src/components/modals/user/EditUserModal.jsx
new file mode 100644
index 0000000..0c84bd5
--- /dev/null
+++ b/frontend/src/components/modals/user/EditUserModal.jsx
@@ -0,0 +1,105 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Modal,
+  Stack,
+  TextInput,
+  Select,
+  Button,
+  Group,
+  PasswordInput,
+  Text,
+} from '@mantine/core';
+
+const EditUserModal = ({ opened, onClose, onEditUser, loading, user }) => {
+  const [formData, setFormData] = useState({
+    email: '',
+    displayName: '',
+    role: '',
+    password: '',
+  });
+
+  useEffect(() => {
+    if (user) {
+      setFormData({
+        email: user.email,
+        displayName: user.displayName || '',
+        role: user.role,
+        password: '',
+      });
+    }
+  }, [user]);
+
+  const handleSubmit = async () => {
+    const updateData = {
+      ...formData,
+      ...(formData.password ? { password: formData.password } : {}),
+    };
+
+    const result = await onEditUser(user.id, updateData);
+    if (result.success) {
+      setFormData({
+        email: '',
+        displayName: '',
+        role: '',
+        password: '',
+      });
+      onClose();
+    }
+  };
+
+  return (
+    <Modal opened={opened} onClose={onClose} title="Edit User" centered>
+      <Stack>
+        <TextInput
+          label="Email"
+          required
+          value={formData.email}
+          onChange={(e) =>
+            setFormData({ ...formData, email: e.currentTarget.value })
+          }
+          placeholder="user@example.com"
+        />
+        <TextInput
+          label="Display Name"
+          value={formData.displayName}
+          onChange={(e) =>
+            setFormData({ ...formData, displayName: e.currentTarget.value })
+          }
+          placeholder="John Doe"
+        />
+        <Select
+          label="Role"
+          required
+          value={formData.role}
+          onChange={(value) => setFormData({ ...formData, role: value })}
+          data={[
+            { value: 'admin', label: 'Admin' },
+            { value: 'editor', label: 'Editor' },
+            { value: 'viewer', label: 'Viewer' },
+          ]}
+        />
+        <PasswordInput
+          label="New Password"
+          value={formData.password}
+          onChange={(e) =>
+            setFormData({ ...formData, password: e.currentTarget.value })
+          }
+          placeholder="Enter new password (leave empty to keep current)"
+        />
+        <Text size="xs" c="dimmed">
+          Leave password empty to keep the current password
+        </Text>
+        <Group justify="flex-end" mt="md">
+          <Button variant="default" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button onClick={handleSubmit} loading={loading}>
+            Save Changes
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+};
+
+export default EditUserModal;
diff --git a/frontend/src/components/settings/admin/AdminUsersTab.jsx b/frontend/src/components/settings/admin/AdminUsersTab.jsx
index 0960058..a5df0bb 100644
--- a/frontend/src/components/settings/admin/AdminUsersTab.jsx
+++ b/frontend/src/components/settings/admin/AdminUsersTab.jsx
@@ -18,6 +18,7 @@ import {
 import { notifications } from '@mantine/notifications';
 import { useAdmin } from '../../../hooks/useAdmin';
 import CreateUserModal from '../../modals/user/CreateUserModal';
+import EditUserModal from '../../modals/user/EditUserModal';
 import DeleteUserModal from '../../modals/user/DeleteUserModal';
 
 const AdminUsersTab = ({ currentUser }) => {
@@ -26,15 +27,22 @@ const AdminUsersTab = ({ currentUser }) => {
     loading,
     error,
     create,
+    update,
     delete: deleteUser,
   } = useAdmin('users');
+
   const [createModalOpened, setCreateModalOpened] = useState(false);
+  const [editModalData, setEditModalData] = useState(null);
   const [deleteModalData, setDeleteModalData] = useState(null);
 
   const handleCreateUser = async (userData) => {
     return await create(userData);
   };
 
+  const handleEditUser = async (id, userData) => {
+    return await update(id, userData);
+  };
+
   const handleDeleteClick = (user) => {
     if (user.id === currentUser.id) {
       notifications.show({
@@ -65,7 +73,11 @@ const AdminUsersTab = ({ currentUser }) => {
       <Table.Td>{new Date(user.createdAt).toLocaleDateString()}</Table.Td>
       <Table.Td>
         <Group gap="xs" justify="flex-end">
-          <ActionIcon variant="subtle" color="blue">
+          <ActionIcon
+            variant="subtle"
+            color="blue"
+            onClick={() => setEditModalData(user)}
+          >
             <IconEdit size={16} />
           </ActionIcon>
           <ActionIcon
@@ -128,6 +140,14 @@ const AdminUsersTab = ({ currentUser }) => {
         loading={loading}
       />
 
+      <EditUserModal
+        opened={!!editModalData}
+        onClose={() => setEditModalData(null)}
+        onEditUser={handleEditUser}
+        user={editModalData}
+        loading={loading}
+      />
+
       <DeleteUserModal
         opened={!!deleteModalData}
         onClose={() => setDeleteModalData(null)}

From 5e2d434b4b1308a0fd585a809324c4d0b21ac581 Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Sun, 10 Nov 2024 15:03:51 +0100
Subject: [PATCH 11/11] Implement admin dash workspaces tab

---
 backend/internal/api/routes.go                |   4 +
 backend/internal/db/workspaces.go             |  40 +++++
 backend/internal/handlers/admin_handlers.go   |  53 ++++++
 .../settings/admin/AdminStatsTab.jsx          |  16 +-
 .../settings/admin/AdminUsersTab.jsx          |   6 +-
 .../settings/admin/AdminWorkspacesTab.jsx     |  28 ++--
 frontend/src/hooks/useAdmin.js                | 155 ------------------
 frontend/src/hooks/useAdminData.js            |  48 ++++++
 frontend/src/hooks/useUserAdmin.js            |  79 +++++++++
 frontend/src/services/adminApi.js             |   8 +-
 frontend/src/utils/formatBytes.js             |  10 ++
 11 files changed, 258 insertions(+), 189 deletions(-)
 delete mode 100644 frontend/src/hooks/useAdmin.js
 create mode 100644 frontend/src/hooks/useAdminData.js
 create mode 100644 frontend/src/hooks/useUserAdmin.js
 create mode 100644 frontend/src/utils/formatBytes.js

diff --git a/backend/internal/api/routes.go b/backend/internal/api/routes.go
index ddb350c..9b37986 100644
--- a/backend/internal/api/routes.go
+++ b/backend/internal/api/routes.go
@@ -50,6 +50,10 @@ func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.FileSystem, authMiddlew
 				r.Put("/{userId}", handler.AdminUpdateUser())
 				r.Delete("/{userId}", handler.AdminDeleteUser())
 			})
+			// Workspace management
+			r.Route("/workspaces", func(r chi.Router) {
+				r.Get("/", handler.AdminListWorkspaces())
+			})
 			// System stats
 			r.Get("/stats", handler.AdminGetSystemStats())
 		})
diff --git a/backend/internal/db/workspaces.go b/backend/internal/db/workspaces.go
index e3f07d9..f2d1815 100644
--- a/backend/internal/db/workspaces.go
+++ b/backend/internal/db/workspaces.go
@@ -249,3 +249,43 @@ func (db *DB) GetLastOpenedFile(workspaceID int) (string, error) {
 	}
 	return filePath.String, nil
 }
+
+// GetAllWorkspaces retrieves all workspaces in the database
+func (db *DB) GetAllWorkspaces() ([]*models.Workspace, error) {
+	rows, err := db.Query(`
+		SELECT 
+			id, user_id, name, created_at,
+			theme, auto_save, 
+			git_enabled, git_url, git_user, git_token, 
+			git_auto_commit, git_commit_msg_template
+		FROM workspaces`,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var workspaces []*models.Workspace
+	for rows.Next() {
+		workspace := &models.Workspace{}
+		var encryptedToken string
+		err := rows.Scan(
+			&workspace.ID, &workspace.UserID, &workspace.Name, &workspace.CreatedAt,
+			&workspace.Theme, &workspace.AutoSave,
+			&workspace.GitEnabled, &workspace.GitURL, &workspace.GitUser, &encryptedToken,
+			&workspace.GitAutoCommit, &workspace.GitCommitMsgTemplate,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		// Decrypt token
+		workspace.GitToken, err = db.decryptToken(encryptedToken)
+		if err != nil {
+			return nil, fmt.Errorf("failed to decrypt token: %w", err)
+		}
+
+		workspaces = append(workspaces, workspace)
+	}
+	return workspaces, nil
+}
diff --git a/backend/internal/handlers/admin_handlers.go b/backend/internal/handlers/admin_handlers.go
index 69ba0c6..dc9ab0c 100644
--- a/backend/internal/handlers/admin_handlers.go
+++ b/backend/internal/handlers/admin_handlers.go
@@ -8,6 +8,7 @@ import (
 	"novamd/internal/httpcontext"
 	"novamd/internal/models"
 	"strconv"
+	"time"
 
 	"github.com/go-chi/chi/v5"
 	"golang.org/x/crypto/bcrypt"
@@ -204,6 +205,58 @@ func (h *Handler) AdminDeleteUser() http.HandlerFunc {
 	}
 }
 
+// WorkspaceStats holds workspace statistics
+type WorkspaceStats struct {
+	UserID             int       `json:"userID"`
+	UserEmail          string    `json:"userEmail"`
+	WorkspaceID        int       `json:"workspaceID"`
+	WorkspaceName      string    `json:"workspaceName"`
+	WorkspaceCreatedAt time.Time `json:"workspaceCreatedAt"`
+	*filesystem.FileCountStats
+}
+
+// AdminListWorkspaces returns a list of all workspaces and their stats
+func (h *Handler) AdminListWorkspaces() http.HandlerFunc {
+	return func(w http.ResponseWriter, _ *http.Request) {
+		workspaces, err := h.DB.GetAllWorkspaces()
+		if err != nil {
+			http.Error(w, "Failed to list workspaces", http.StatusInternalServerError)
+			return
+		}
+
+		workspacesStats := make([]*WorkspaceStats, 0, len(workspaces))
+
+		for _, ws := range workspaces {
+
+			workspaceData := &WorkspaceStats{}
+
+			user, err := h.DB.GetUserByID(ws.UserID)
+			if err != nil {
+				http.Error(w, "Failed to get user", http.StatusInternalServerError)
+				return
+			}
+
+			workspaceData.UserID = ws.UserID
+			workspaceData.UserEmail = user.Email
+			workspaceData.WorkspaceID = ws.ID
+			workspaceData.WorkspaceName = ws.Name
+			workspaceData.WorkspaceCreatedAt = ws.CreatedAt
+
+			fileStats, err := h.FS.GetFileStats(ws.UserID, ws.ID)
+			if err != nil {
+				http.Error(w, "Failed to get file stats", http.StatusInternalServerError)
+				return
+			}
+
+			workspaceData.FileCountStats = fileStats
+
+			workspacesStats = append(workspacesStats, workspaceData)
+		}
+
+		respondJSON(w, workspacesStats)
+	}
+}
+
 // SystemStats holds system-wide statistics
 type SystemStats struct {
 	*db.UserStats
diff --git a/frontend/src/components/settings/admin/AdminStatsTab.jsx b/frontend/src/components/settings/admin/AdminStatsTab.jsx
index b8564da..3b7346f 100644
--- a/frontend/src/components/settings/admin/AdminStatsTab.jsx
+++ b/frontend/src/components/settings/admin/AdminStatsTab.jsx
@@ -1,21 +1,11 @@
 import React from 'react';
 import { Table, Text, Box, LoadingOverlay, Alert } from '@mantine/core';
 import { IconAlertCircle } from '@tabler/icons-react';
-import { useAdmin } from '../../../hooks/useAdmin';
-
-const formatBytes = (bytes) => {
-  const units = ['B', 'KB', 'MB', 'GB'];
-  let size = bytes;
-  let unitIndex = 0;
-  while (size >= 1024 && unitIndex < units.length - 1) {
-    size /= 1024;
-    unitIndex++;
-  }
-  return `${size.toFixed(1)} ${units[unitIndex]}`;
-};
+import { useAdminData } from '../../../hooks/useAdminData';
+import { formatBytes } from '../../../utils/formatBytes';
 
 const AdminStatsTab = () => {
-  const { data: stats, loading, error } = useAdmin('stats');
+  const { data: stats, loading, error } = useAdminData('stats');
 
   if (loading) {
     return <LoadingOverlay visible={true} />;
diff --git a/frontend/src/components/settings/admin/AdminUsersTab.jsx b/frontend/src/components/settings/admin/AdminUsersTab.jsx
index a5df0bb..f6d5b99 100644
--- a/frontend/src/components/settings/admin/AdminUsersTab.jsx
+++ b/frontend/src/components/settings/admin/AdminUsersTab.jsx
@@ -16,20 +16,20 @@ import {
   IconAlertCircle,
 } from '@tabler/icons-react';
 import { notifications } from '@mantine/notifications';
-import { useAdmin } from '../../../hooks/useAdmin';
+import { useUserAdmin } from '../../../hooks/useUserAdmin';
 import CreateUserModal from '../../modals/user/CreateUserModal';
 import EditUserModal from '../../modals/user/EditUserModal';
 import DeleteUserModal from '../../modals/user/DeleteUserModal';
 
 const AdminUsersTab = ({ currentUser }) => {
   const {
-    data: users,
+    users,
     loading,
     error,
     create,
     update,
     delete: deleteUser,
-  } = useAdmin('users');
+  } = useUserAdmin();
 
   const [createModalOpened, setCreateModalOpened] = useState(false);
   const [editModalData, setEditModalData] = useState(null);
diff --git a/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx b/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx
index 8de5f2f..5c2cf9d 100644
--- a/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx
+++ b/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx
@@ -9,27 +9,21 @@ import {
   Alert,
 } from '@mantine/core';
 import { IconTrash, IconEdit, IconAlertCircle } from '@tabler/icons-react';
-import { useAdmin } from '../../../hooks/useAdmin';
+import { useAdminData } from '../../../hooks/useAdminData';
+import { formatBytes } from '../../../utils/formatBytes';
 
 const AdminWorkspacesTab = () => {
-  const { data: workspaces, loading, error } = useAdmin('workspaces');
+  const { data: workspaces, loading, error } = useAdminData('workspaces');
 
   const rows = workspaces.map((workspace) => (
     <Table.Tr key={workspace.id}>
-      <Table.Td>{workspace.name}</Table.Td>
-      <Table.Td>{workspace.owner?.email}</Table.Td>
-      <Table.Td>{new Date(workspace.createdAt).toLocaleDateString()}</Table.Td>
-      <Table.Td>{workspace.gitEnabled ? 'Yes' : 'No'}</Table.Td>
+      <Table.Td>{workspace.userEmail}</Table.Td>
+      <Table.Td>{workspace.workspaceName}</Table.Td>
       <Table.Td>
-        <Group gap="xs" justify="flex-end">
-          <ActionIcon variant="subtle" color="blue">
-            <IconEdit size={16} />
-          </ActionIcon>
-          <ActionIcon variant="subtle" color="red">
-            <IconTrash size={16} />
-          </ActionIcon>
-        </Group>
+        {new Date(workspace.workspaceCreatedAt).toLocaleDateString()}
       </Table.Td>
+      <Table.Td>{workspace.totalFiles}</Table.Td>
+      <Table.Td>{formatBytes(workspace.totalSize)}</Table.Td>
     </Table.Tr>
   ));
 
@@ -57,11 +51,11 @@ const AdminWorkspacesTab = () => {
       <Table striped highlightOnHover withTableBorder>
         <Table.Thead>
           <Table.Tr>
-            <Table.Th>Name</Table.Th>
             <Table.Th>Owner</Table.Th>
+            <Table.Th>Name</Table.Th>
             <Table.Th>Created At</Table.Th>
-            <Table.Th>Git Enabled</Table.Th>
-            <Table.Th style={{ width: 100 }}>Actions</Table.Th>
+            <Table.Th>Total Files</Table.Th>
+            <Table.Th>Total Size</Table.Th>
           </Table.Tr>
         </Table.Thead>
         <Table.Tbody>{rows}</Table.Tbody>
diff --git a/frontend/src/hooks/useAdmin.js b/frontend/src/hooks/useAdmin.js
deleted file mode 100644
index 08d3cc4..0000000
--- a/frontend/src/hooks/useAdmin.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import { useState, useCallback, useEffect } from 'react';
-import { notifications } from '@mantine/notifications';
-import * as adminApi from '../services/adminApi';
-
-export const useAdmin = (resource) => {
-  const [data, setData] = useState([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(null);
-
-  const fetchData = useCallback(async () => {
-    setLoading(true);
-    try {
-      let result;
-      switch (resource) {
-        case 'users':
-          result = await adminApi.listUsers();
-          break;
-        case 'stats':
-          result = await adminApi.getSystemStats();
-          break;
-        default:
-          throw new Error(`Unknown resource type: ${resource}`);
-      }
-      setData(result);
-      setError(null);
-    } catch (err) {
-      console.error(`Failed to fetch ${resource}:`, err);
-      setError(err.message);
-      notifications.show({
-        title: 'Error',
-        message: `Failed to load ${resource}. Please try again.`,
-        color: 'red',
-      });
-    } finally {
-      setLoading(false);
-    }
-  }, [resource]);
-
-  const createItem = useCallback(
-    async (itemData) => {
-      try {
-        let newItem;
-        switch (resource) {
-          case 'users':
-            newItem = await adminApi.createUser(itemData);
-            break;
-          default:
-            throw new Error(`Create not supported for resource: ${resource}`);
-        }
-        setData((prevData) =>
-          Array.isArray(prevData) ? [...prevData, newItem] : prevData
-        );
-        notifications.show({
-          title: 'Success',
-          message: `${resource} created successfully`,
-          color: 'green',
-        });
-        return { success: true, data: newItem };
-      } catch (err) {
-        console.error(`Failed to create ${resource}:`, err);
-        notifications.show({
-          title: 'Error',
-          message: err.message || `Failed to create ${resource}`,
-          color: 'red',
-        });
-        return { success: false, error: err.message };
-      }
-    },
-    [resource]
-  );
-
-  const deleteItem = useCallback(
-    async (itemId) => {
-      try {
-        switch (resource) {
-          case 'users':
-            await adminApi.deleteUser(itemId);
-            break;
-          default:
-            throw new Error(`Delete not supported for resource: ${resource}`);
-        }
-        setData((prevData) =>
-          Array.isArray(prevData)
-            ? prevData.filter((item) => item.id !== itemId)
-            : prevData
-        );
-        notifications.show({
-          title: 'Success',
-          message: `${resource} deleted successfully`,
-          color: 'green',
-        });
-        return { success: true };
-      } catch (err) {
-        console.error(`Failed to delete ${resource}:`, err);
-        notifications.show({
-          title: 'Error',
-          message: err.message || `Failed to delete ${resource}`,
-          color: 'red',
-        });
-        return { success: false, error: err.message };
-      }
-    },
-    [resource]
-  );
-
-  const updateItem = useCallback(
-    async (itemId, itemData) => {
-      try {
-        let updatedItem;
-        switch (resource) {
-          case 'users':
-            updatedItem = await adminApi.updateUser(itemId, itemData);
-            break;
-          default:
-            throw new Error(`Update not supported for resource: ${resource}`);
-        }
-        setData((prevData) =>
-          Array.isArray(prevData)
-            ? prevData.map((item) => (item.id === itemId ? updatedItem : item))
-            : prevData
-        );
-        notifications.show({
-          title: 'Success',
-          message: `${resource} updated successfully`,
-          color: 'green',
-        });
-        return { success: true, data: updatedItem };
-      } catch (err) {
-        console.error(`Failed to update ${resource}:`, err);
-        notifications.show({
-          title: 'Error',
-          message: err.message || `Failed to update ${resource}`,
-          color: 'red',
-        });
-        return { success: false, error: err.message };
-      }
-    },
-    [resource]
-  );
-
-  // Fetch data on mount
-  useEffect(() => {
-    fetchData();
-  }, [fetchData]);
-
-  return {
-    data,
-    loading,
-    error,
-    refresh: fetchData,
-    create: createItem,
-    delete: deleteItem,
-    update: updateItem,
-  };
-};
diff --git a/frontend/src/hooks/useAdminData.js b/frontend/src/hooks/useAdminData.js
new file mode 100644
index 0000000..9669ad3
--- /dev/null
+++ b/frontend/src/hooks/useAdminData.js
@@ -0,0 +1,48 @@
+import { useState, useEffect } from 'react';
+import { notifications } from '@mantine/notifications';
+import { getUsers, getWorkspaces, getSystemStats } from '../services/adminApi';
+
+// Hook for admin data fetching (stats and workspaces)
+export const useAdminData = (type) => {
+  const [data, setData] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  const loadData = async () => {
+    setLoading(true);
+    setError(null);
+    try {
+      let response;
+      switch (type) {
+        case 'stats':
+          response = await getSystemStats();
+          break;
+        case 'workspaces':
+          response = await getWorkspaces();
+          break;
+        case 'users':
+          response = await getUsers();
+          break;
+        default:
+          throw new Error('Invalid data type');
+      }
+      setData(response);
+    } catch (err) {
+      const message = err.response?.data?.error || err.message;
+      setError(message);
+      notifications.show({
+        title: 'Error',
+        message: `Failed to load ${type}: ${message}`,
+        color: 'red',
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    loadData();
+  }, [type]);
+
+  return { data, loading, error, reload: loadData };
+};
diff --git a/frontend/src/hooks/useUserAdmin.js b/frontend/src/hooks/useUserAdmin.js
new file mode 100644
index 0000000..f8e0a1d
--- /dev/null
+++ b/frontend/src/hooks/useUserAdmin.js
@@ -0,0 +1,79 @@
+import { useAdminData } from './useAdminData';
+import { createUser, updateUser, deleteUser } from '../services/adminApi';
+import { notifications } from '@mantine/notifications';
+
+export const useUserAdmin = () => {
+  const { data: users, loading, error, reload } = useAdminData('users');
+
+  const handleCreate = async (userData) => {
+    try {
+      await createUser(userData);
+      notifications.show({
+        title: 'Success',
+        message: 'User created successfully',
+        color: 'green',
+      });
+      reload();
+      return { success: true };
+    } catch (err) {
+      const message = err.response?.data?.error || err.message;
+      notifications.show({
+        title: 'Error',
+        message: `Failed to create user: ${message}`,
+        color: 'red',
+      });
+      return { success: false, error: message };
+    }
+  };
+
+  const handleUpdate = async (userId, userData) => {
+    try {
+      await updateUser(userId, userData);
+      notifications.show({
+        title: 'Success',
+        message: 'User updated successfully',
+        color: 'green',
+      });
+      reload();
+      return { success: true };
+    } catch (err) {
+      const message = err.response?.data?.error || err.message;
+      notifications.show({
+        title: 'Error',
+        message: `Failed to update user: ${message}`,
+        color: 'red',
+      });
+      return { success: false, error: message };
+    }
+  };
+
+  const handleDelete = async (userId) => {
+    try {
+      await deleteUser(userId);
+      notifications.show({
+        title: 'Success',
+        message: 'User deleted successfully',
+        color: 'green',
+      });
+      reload();
+      return { success: true };
+    } catch (err) {
+      const message = err.response?.data?.error || err.message;
+      notifications.show({
+        title: 'Error',
+        message: `Failed to delete user: ${message}`,
+        color: 'red',
+      });
+      return { success: false, error: message };
+    }
+  };
+
+  return {
+    users,
+    loading,
+    error,
+    create: handleCreate,
+    update: handleUpdate,
+    delete: handleDelete,
+  };
+};
diff --git a/frontend/src/services/adminApi.js b/frontend/src/services/adminApi.js
index 3c3bec3..3c011d0 100644
--- a/frontend/src/services/adminApi.js
+++ b/frontend/src/services/adminApi.js
@@ -4,7 +4,7 @@ import { API_BASE_URL } from '../utils/constants';
 const ADMIN_BASE_URL = `${API_BASE_URL}/admin`;
 
 // User Management
-export const listUsers = async () => {
+export const getUsers = async () => {
   const response = await apiCall(`${ADMIN_BASE_URL}/users`);
   return response.json();
 };
@@ -36,6 +36,12 @@ export const updateUser = async (userId, userData) => {
   return response.json();
 };
 
+// Workspace Management
+export const getWorkspaces = async () => {
+  const response = await apiCall(`${ADMIN_BASE_URL}/workspaces`);
+  return response.json();
+};
+
 // System Statistics
 export const getSystemStats = async () => {
   const response = await apiCall(`${ADMIN_BASE_URL}/stats`);
diff --git a/frontend/src/utils/formatBytes.js b/frontend/src/utils/formatBytes.js
new file mode 100644
index 0000000..dde9f21
--- /dev/null
+++ b/frontend/src/utils/formatBytes.js
@@ -0,0 +1,10 @@
+export const formatBytes = (bytes) => {
+  const units = ['B', 'KB', 'MB', 'GB'];
+  let size = bytes;
+  let unitIndex = 0;
+  while (size >= 1024 && unitIndex < units.length - 1) {
+    size /= 1024;
+    unitIndex++;
+  }
+  return `${size.toFixed(1)} ${units[unitIndex]}`;
+};