diff options
| author | a73x <[email protected]> | 2024-11-03 11:01:35 +0000 |
|---|---|---|
| committer | alex emery <[email protected]> | 2024-11-03 11:36:21 +0000 |
| commit | 22bfae8f9637633d5608caad3ce56b64c6819505 (patch) | |
| tree | 2bcbfd4bac966ef1dea70ead5648a131a4301750 /web | |
| parent | bddebada1aeee5eb87ff4e52a0b7bdf9c966f912 (diff) | |
remove embedded fs
Diffstat (limited to 'web')
| -rw-r--r-- | web/web.go | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -1,13 +1,10 @@ package web import ( - "fmt" - "io/fs" "net/http" "time" "git.sr.ht/~a73x/home/pages" - "git.sr.ht/~a73x/home/public" "go.uber.org/zap" ) @@ -26,17 +23,14 @@ func New(logger *zap.Logger) (*http.Server, error) { } mux := http.NewServeMux() - pages, err := pages.Collect() + pages, err := pages.Collect("./content") if err != nil { return nil, err } - staticFs, err := fs.Sub(public.FS, "static") - if err != nil { - return nil, fmt.Errorf("failed to setup static handler: %v", err) - } + staticFs := http.FileServer(http.Dir("./public/static")) - mux.Handle("GET /static/", http.StripPrefix("/static/", http.FileServer(http.FS(staticFs)))) + mux.Handle("GET /static/", http.StripPrefix("/static/", staticFs)) for _, page := range pages { mux.HandleFunc("GET "+page.Path, func(w http.ResponseWriter, r *http.Request) { w.Write([]byte(page.Content)) |
