mirror of
https://github.com/renorris/openfsd
synced 2026-03-22 23:05:36 +08:00
335409c4b4
1. Database Enhancements (db/repositories.go): - Added ConfigRepository interface and implementations for PostgreSQL and SQLite - Updated Repositories struct to include ConfigRepository - Modified NewRepositories to initialize both UserRepo and ConfigRepo 2. FSD Server Improvements: - Removed hardcoded jwtSecret, now retrieved from ConfigRepository (fsd/conn.go, web/auth.go) - Added dynamic welcome message retrieval from ConfigRepository (fsd/conn.go) - Optimized METAR buffer size from 4096 to 512 bytes (fsd/metar.go) - Reduced minimum fields for DeleteATC and DeletePilot packets (fsd/packet.go) - Improved Haversine distance calculation with constants (fsd/postoffice.go) - Added thread-safety documentation for sendError (fsd/client.go) 3. Server Configuration (fsd/server.go): - Added NewDefaultServer to initialize server with environment-based config - Implemented automatic database migration and default admin user creation - Added configurable METAR worker count - Improved logging with slog and environment-based debug level 4. Web Interface Enhancements: - Added user and config editor frontend routes (web/frontend.go, web/routes.go) - Improved JWT handling by retrieving secret from ConfigRepository (web/auth.go) - Enhanced user management API endpoints (web/user.go) - Updated dashboard to display CID and conditional admin links (web/templates/dashboard.html) - Embedded templates using go:embed (web/templates.go) 5. Frontend JavaScript Improvements: - Added networkRatingFromInt helper for readable ratings (web/static/js/openfsd/dashboard.js) - Improved API request handling with auth/no-auth variants (web/static/js/openfsd/api.js) 6. Miscellaneous: - Added sethvargo/go-envconfig dependency for environment variable parsing - Fixed parseVisRange to use 64-bit float parsing (fsd/util.go) - Added strPtr utility function (fsd/util.go, web/main.go) - Improved SVG logo rendering in layout (web/templates/layout.html)
37 lines
708 B
Go
37 lines
708 B
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"embed"
|
|
"github.com/gin-gonic/gin"
|
|
"html/template"
|
|
"io"
|
|
"net/http"
|
|
"path"
|
|
)
|
|
|
|
//go:embed templates
|
|
var templatesFS embed.FS
|
|
|
|
var basePath = path.Join(".", "templates")
|
|
|
|
func loadTemplate(key string) (t *template.Template) {
|
|
t, err := template.ParseFS(templatesFS, path.Join(basePath, "layout.html"), path.Join(basePath, key+".html"))
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return
|
|
}
|
|
|
|
func writeTemplate(c *gin.Context, key string, data any) {
|
|
c.Writer.Header().Set("Content-Type", "text/html")
|
|
|
|
buf := bytes.Buffer{}
|
|
if err := loadTemplate(key).Execute(&buf, nil); err != nil {
|
|
c.Writer.WriteHeader(http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
io.Copy(c.Writer, &buf)
|
|
}
|