Fix settings saving

backend/internal/api/workspace_handlers.go

@@ -218,21 +218,29 @@ func UpdateWorkspaceSettings(db *db.DB, fs *filesystem.FileSystem) http.HandlerF
 			return
 		}
 
-		var settings models.WorkspaceSettings
-		if err := json.NewDecoder(r.Body).Decode(&settings); err != nil {
+		var userSettings models.UserSettings
+		if err := json.NewDecoder(r.Body).Decode(&userSettings); err != nil {
+			http.Error(w, "Invalid request body", http.StatusBadRequest)
+			return
+		}
+
+		if err := userSettings.Validate(); err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
 
-		settings.WorkspaceID = workspaceID
+		workspaceSettings := &models.WorkspaceSettings{
+			WorkspaceID: workspaceID,
+			Settings:    userSettings,
+		}
 
-		if err := db.SaveWorkspaceSettings(&settings); err != nil {
+		if err := db.SaveWorkspaceSettings(workspaceSettings); err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		if settings.Settings.GitEnabled {
-			err := fs.SetupGitRepo(userID, workspaceID, settings.Settings.GitURL, settings.Settings.GitUser, settings.Settings.GitToken)
+		if userSettings.GitEnabled {
+			err := fs.SetupGitRepo(userID, workspaceID, userSettings.GitURL, userSettings.GitUser, userSettings.GitToken)
 			if err != nil {
 				http.Error(w, "Failed to setup git repo", http.StatusInternalServerError)
 				return
@@ -241,6 +249,6 @@ func UpdateWorkspaceSettings(db *db.DB, fs *filesystem.FileSystem) http.HandlerF
 			fs.DisableGitRepo(userID, workspaceID)
 		}
 
-		respondJSON(w, settings)
+		respondJSON(w, workspaceSettings)
 	}
 }

backend/internal/user/user.go

@@ -17,6 +17,17 @@ type UserService struct {
 	FS *filesystem.FileSystem
 }
 
+// Default settings for new workspaces
+var defaultWorkspaceSettings = models.WorkspaceSettings{
+	Settings: models.UserSettings{
+		Theme:                "light",
+		AutoSave:             false,
+		GitEnabled:           false,
+		GitAutoCommit:        false,
+		GitCommitMsgTemplate: "${action} ${filename}",
+	},
+}
+
 func NewUserService(database *db.DB, fs *filesystem.FileSystem) *UserService {
 	return &UserService{
 		DB: database,
@@ -62,6 +73,13 @@ func (s *UserService) SetupAdminUser() (*models.User, error) {
 		return nil, fmt.Errorf("failed to initialize admin workspace: %w", err)
 	}
 
+	// Save default settings for the admin workspace
+	defaultWorkspaceSettings.WorkspaceID = adminUser.LastWorkspaceID
+	err = s.DB.SaveWorkspaceSettings(&defaultWorkspaceSettings)
+	if err != nil {
+		return nil, fmt.Errorf("failed to save default workspace settings: %w", err)
+	}
+
 	log.Printf("Created admin user with ID: %d and default workspace with ID: %d", adminUser.ID, adminUser.LastWorkspaceID)
 
 	return adminUser, nil
@@ -78,6 +96,14 @@ func (s *UserService) CreateUser(user *models.User) error {
 		return fmt.Errorf("failed to initialize user workspace: %w", err)
 	}
 
+	// Save default settings for the user's workspace
+	settings := defaultWorkspaceSettings
+	settings.WorkspaceID = user.LastWorkspaceID
+	err = s.DB.SaveWorkspaceSettings(&settings)
+	if err != nil {
+		return fmt.Errorf("failed to save default workspace settings: %w", err)
+	}
+
 	return nil
 }