diff --git a/assets/view.go b/assets/view.go index 2e8e597..fe222b3 100644 --- a/assets/view.go +++ b/assets/view.go @@ -17,7 +17,7 @@ var ( func entrypointFiles(app, category string) []string { if entrypoints == nil { - value, _ := statics.ReadFile("static/entrypoints.json") + value, _ := statics.ReadFile("dist/entrypoints.json") json.Unmarshal(value, &entrypoints) } @@ -38,7 +38,7 @@ func entrypointFiles(app, category string) []string { func Asset(name string) string { if manifest == nil { - value, _ := statics.ReadFile("static/manifest.json") + value, _ := statics.ReadFile("dist/manifest.json") json.Unmarshal(value, &manifest) } diff --git a/cmd/server/server.go b/cmd/server/server.go index e771a99..9fcb48f 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -36,10 +36,10 @@ func main() { e := echo.New() e.Validator = &AppValidator{validator: validator.New()} - e.Static("/static", "static") + e.Static("/dist", "dist") assetHandler := http.FileServer(rice.MustFindBox("../../assets/dist").HTTPBox()) - e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", assetHandler))) + e.GET("/dist/*", echo.WrapHandler(http.StripPrefix("/dist/", assetHandler))) e.Use(middleware.Logger()) router.RegisterControllers(e) diff --git a/internal/web/controller/chat/controller.go b/internal/web/controller/chat/controller.go index a5f654c..ab42367 100644 --- a/internal/web/controller/chat/controller.go +++ b/internal/web/controller/chat/controller.go @@ -42,9 +42,9 @@ func (ctrl *Controller) Messages(c echo.Context) error { msg.WebhookMessage.User.DisplayColor, )) - originIcon = Img(Src(assets.Asset("static/img/owncast.png")), Class("message-origin")) + originIcon = Img(Src(assets.Asset("dist/img/owncast.png")), Class("message-origin")) case store.MessageOriginTwitch: - originIcon = Img(Src(assets.Asset("static/img/twitch.png")), Class("message-origin")) + originIcon = Img(Src(assets.Asset("dist/img/twitch.png")), Class("message-origin")) } return Div( @@ -68,7 +68,7 @@ func (ctrl *Controller) Messages(c echo.Context) error { Language: "fr", Head: []Node{ Group(assets.EntrypointCss("main")), - Link(Rel("icon"), Type("image/x-icon"), Href(assets.Asset("static/img/favicon.png"))), + Link(Rel("icon"), Type("image/x-icon"), Href(assets.Asset("dist/img/favicon.png"))), }, Body: []Node{ ID("chat"),