diff --git a/backend/go.mod b/backend/go.mod index c980f49..67787c4 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -4,5 +4,17 @@ go 1.23.1 require ( github.com/go-chi/chi/v5 v5.1.0 + github.com/go-playground/validator/v10 v10.22.1 github.com/mattn/go-sqlite3 v1.14.23 ) + +require ( + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/text v0.14.0 // indirect +) diff --git a/backend/go.sum b/backend/go.sum index 3491db0..1998df1 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,4 +1,32 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= +github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0= github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/backend/internal/api/handlers.go b/backend/internal/api/handlers.go index e494dc8..f59b71f 100644 --- a/backend/internal/api/handlers.go +++ b/backend/internal/api/handlers.go @@ -73,6 +73,11 @@ func DeleteFile(fs *filesystem.FileSystem) http.HandlerFunc { } } +var defaultSettings = models.UserSettings{ + Theme: "light", + AutoSave: false, +} + func GetSettings(db *db.DB) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { userIDStr := r.URL.Query().Get("userId") @@ -88,6 +93,8 @@ func GetSettings(db *db.DB) http.HandlerFunc { return } + settings.SetDefaults(defaultSettings) + json.NewEncoder(w).Encode(settings) } } @@ -100,6 +107,13 @@ func UpdateSettings(db *db.DB) http.HandlerFunc { return } + settings.SetDefaults(defaultSettings) + + if err := settings.Validate(); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + err := db.SaveSettings(settings) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) diff --git a/backend/internal/db/migrations.go b/backend/internal/db/migrations.go index 9c2e6ce..d0de616 100644 --- a/backend/internal/db/migrations.go +++ b/backend/internal/db/migrations.go @@ -15,10 +15,9 @@ var migrations = []Migration{ Version: 1, SQL: `CREATE TABLE IF NOT EXISTS settings ( user_id INTEGER PRIMARY KEY, - settings TEXT + settings JSON NOT NULL )`, }, - // Add new migrations here as your schema evolves } func (db *DB) Migrate() error { diff --git a/backend/internal/db/settings.go b/backend/internal/db/settings.go index e6b844f..f0da94a 100644 --- a/backend/internal/db/settings.go +++ b/backend/internal/db/settings.go @@ -9,17 +9,20 @@ import ( func (db *DB) GetSettings(userID int) (models.Settings, error) { var settings models.Settings - var settingsJSON string + var settingsJSON []byte err := db.QueryRow("SELECT user_id, settings FROM settings WHERE user_id = ?", userID).Scan(&settings.UserID, &settingsJSON) if err != nil { if err == sql.ErrNoRows { + // If no settings found, return default settings + settings.UserID = userID + settings.Settings = models.UserSettings{} // This will be filled with defaults later return settings, nil } return settings, err } - err = json.Unmarshal([]byte(settingsJSON), &settings.Settings) + err = json.Unmarshal(settingsJSON, &settings.Settings) if err != nil { return settings, err } @@ -28,11 +31,15 @@ func (db *DB) GetSettings(userID int) (models.Settings, error) { } func (db *DB) SaveSettings(settings models.Settings) error { + if err := settings.Validate(); err != nil { + return err + } + settingsJSON, err := json.Marshal(settings.Settings) if err != nil { return err } - _, err = db.Exec("INSERT OR REPLACE INTO settings (user_id, settings) VALUES (?, ?)", settings.UserID, string(settingsJSON)) + _, err = db.Exec("INSERT OR REPLACE INTO settings (user_id, settings) VALUES (?, json(?))", settings.UserID, string(settingsJSON)) return err } diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go index 6fcc15b..31a833d 100644 --- a/backend/internal/models/settings.go +++ b/backend/internal/models/settings.go @@ -1,6 +1,42 @@ package models -type Settings struct { - UserID int `json:"userId"` - Settings map[string]interface{} `json:"settings"` +import ( + "encoding/json" + + "github.com/go-playground/validator/v10" +) + +type UserSettings struct { + Theme string `json:"theme" validate:"oneof=light dark"` + AutoSave bool `json:"autoSave"` +} + +type Settings struct { + UserID int `json:"userId" validate:"required,min=1"` + Settings UserSettings `json:"settings" validate:"required,dive"` +} + +var validate = validator.New() + +func (s *Settings) Validate() error { + return validate.Struct(s) +} + +func (s *Settings) SetDefaults(defaults UserSettings) { + if s.Settings.Theme == "" { + s.Settings.Theme = defaults.Theme + } +} + +func (s *Settings) UnmarshalJSON(data []byte) error { + type Alias Settings + aux := &struct { + *Alias + }{ + Alias: (*Alias)(s), + } + if err := json.Unmarshal(data, &aux); err != nil { + return err + } + return s.Validate() } diff --git a/frontend/src/components/Settings.js b/frontend/src/components/Settings.js index 76adc64..19fd716 100644 --- a/frontend/src/components/Settings.js +++ b/frontend/src/components/Settings.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { Modal, Text, Toggle, Tooltip, Input, Spacer, Button, useTheme } from '@geist-ui/core'; +import { Modal, Text, Toggle, Tooltip, Spacer, useTheme } from '@geist-ui/core'; const Settings = ({ visible, onClose, currentTheme, onThemeChange, onSettingsChange }) => { const theme = useTheme();