Add web UI: login, dashboard, and share management (templ + Tailwind + htmx)
New internal/web package mounted at /ui/, separate from DAV Basic Auth: - Cookie-based sessions (opaque random tokens in a new web_sessions SQLite table, internal/db/sessions.go), checked against the same cfg.Users/bcrypt credentials as DAV Basic Auth. - Dashboard listing the logged-in user's own calendars/address books, who they're shared with, and what's shared with them. - Share/unshare directly from the dashboard, updated in place via htmx partial swaps (POST to create/update, DELETE to revoke). Always verifies the resource actually belongs to the logged-in user before granting a share. - Templates written in templ (internal/web/templates/*.templ, generated *_templ.go committed), styled with Tailwind CSS v4 (web/input.css, compiled to web/static/app.css), with htmx vendored as a static file for the dynamic bits. Both are embedded into the binary at build time (web/staticassets.go) so the compiled server has no Node.js/web/ runtime dependency. - Wired into cmd/server/main.go at /ui/ alongside the existing /cal/, /card/, /files/ routes; welcome page links to it. - Tests: internal/web/server_test.go covers login success/failure, the login-required redirect, dashboard rendering, share/unshare including the htmx-v2-sends-DELETE-params-as-query-string quirk, and rejecting shares of resources the user doesn't own. - Docs: README (new 'Web UI' section, updated sharing section, project layout, dependencies) and copilot-instructions updated accordingly. Makefile: new templ-generate/web-deps/web-css targets. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
+10
-1
@@ -19,7 +19,9 @@ import (
|
||||
"github.com/yourusername/caldav-server/internal/config"
|
||||
"github.com/yourusername/caldav-server/internal/db"
|
||||
"github.com/yourusername/caldav-server/internal/store"
|
||||
"github.com/yourusername/caldav-server/internal/web"
|
||||
filewebdav "github.com/yourusername/caldav-server/internal/webdav"
|
||||
webstatic "github.com/yourusername/caldav-server/web"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -79,8 +81,9 @@ func main() {
|
||||
calHandler := caldav.NewHandler(cfg, st, dbase, logger)
|
||||
cardHandler := carddav.NewHandler(cfg, st, dbase, logger)
|
||||
fileHandler := filewebdav.NewHandler(cfg, cfg.Storage.DataDir, logger)
|
||||
webUI := web.NewServer(cfg, st, dbase, logger)
|
||||
|
||||
mux := buildMux(cfg, authMw, calHandler, cardHandler, fileHandler, logger)
|
||||
mux := buildMux(cfg, authMw, calHandler, cardHandler, fileHandler, webUI, logger)
|
||||
|
||||
// ---- HTTP Server ----
|
||||
addr := net.JoinHostPort(cfg.Server.Host, fmt.Sprintf("%d", cfg.Server.Port))
|
||||
@@ -128,10 +131,15 @@ func buildMux(
|
||||
cfg *config.Config,
|
||||
authMw *auth.Middleware,
|
||||
calHandler, cardHandler, fileHandler http.Handler,
|
||||
webUI *web.Server,
|
||||
logger *slog.Logger,
|
||||
) *http.ServeMux {
|
||||
mux := http.NewServeMux()
|
||||
|
||||
// Web UI (own cookie-based auth, not Basic Auth) — dashboard, login,
|
||||
// share management.
|
||||
mux.Handle("/ui/", webUI.Handler(webstatic.FS()))
|
||||
|
||||
// /.well-known/ redirects for auto-discovery
|
||||
mux.HandleFunc("/.well-known/caldav", func(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, cfg.Server.BaseURL+"/cal/", http.StatusMovedPermanently)
|
||||
@@ -248,5 +256,6 @@ const welcomePage = `<!DOCTYPE html>
|
||||
<li><code>%s/.well-known/carddav</code></li>
|
||||
</ul>
|
||||
<p><em>Authentication: HTTP Basic Auth</em></p>
|
||||
<p><a href="/ui/">Open the web dashboard →</a></p>
|
||||
</body>
|
||||
</html>`
|
||||
|
||||
Reference in New Issue
Block a user