From 1f8364b145dbd0ff9ff7583f50aeb7498967b0f9 Mon Sep 17 00:00:00 2001 From: Ewy Date: Fri, 18 Sep 2026 15:06:59 +0200 Subject: add more stuff --- server/server.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'server/server.go') diff --git a/server/server.go b/server/server.go index 798bab6..af8393d 100644 --- a/server/server.go +++ b/server/server.go @@ -3,28 +3,30 @@ package server import ( "embed" "fmt" - "github.com/spf13/pflag" - "html/template" + "io/fs" "net" "net/http" "sakura/cfg" "sakura/server/api" "strconv" + + "github.com/spf13/pflag" ) //go:embed web var web embed.FS -var tmpl *template.Template - func Start() { pflag.Parse() fmt.Println("Server started") addr := net.JoinHostPort(*cfg.Host, strconv.Itoa(*cfg.Port)) fmt.Printf("Listening on %s\n", addr) var err error - tmpl, err = template.ParseFS(web, "web/**.gohtml") - http.HandleFunc("/{$}", serveHome) + if err != nil { + panic(err) + } + sub, err := fs.Sub(web, "web") + http.Handle("/", http.FileServer(http.FS(sub))) http.HandleFunc(cfg.CreateMethod+" "+cfg.CreatePath, api.GameCreate) http.HandleFunc(cfg.ConnectMethod+" "+cfg.ConnectPath, api.GameConnect) err = http.ListenAndServe(addr, nil) @@ -32,10 +34,3 @@ func Start() { panic(err) } } - -func serveHome(w http.ResponseWriter, r *http.Request) { - err := tmpl.ExecuteTemplate(w, "index.gohtml", nil) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - } -} -- cgit v1.3.1