diff --git a/public/index.frontoffice.html b/public/index.frontoffice.html index f7e2f80f..45fe7b76 100644 --- a/public/index.frontoffice.html +++ b/public/index.frontoffice.html @@ -187,10 +187,8 @@ } customElements.define("component-nyan", NyanCatLoader); - - {{ else }} - {{ end }} + diff --git a/server/ctrl/static.go b/server/ctrl/static.go index d469298e..9ebba934 100644 --- a/server/ctrl/static.go +++ b/server/ctrl/static.go @@ -295,6 +295,11 @@ func ServeFrontofficeHandler(ctx *App, res http.ResponseWriter, req *http.Reques ServeIndex("index.frontoffice.html")(ctx, res, req) } +func ServeFavicon(ctx *App, res http.ResponseWriter, req *http.Request) { + r, _ := http.NewRequest(http.MethodGet, "/favicon.svg", nil) + ServeFile("/assets/logo/")(ctx, res, r) +} + func NotFoundHandler(ctx *App, res http.ResponseWriter, req *http.Request) { if strings.Contains(req.Header.Get("accept"), "text/html") { res.WriteHeader(http.StatusNotFound) diff --git a/server/routes.go b/server/routes.go index 1df97898..ea62000e 100644 --- a/server/routes.go +++ b/server/routes.go @@ -99,7 +99,7 @@ func Build(a App) *mux.Router { r.HandleFunc(WithBase("/sw_cache.js"), NewMiddlewareChain(LegacyStaticHandler("/assets/worker/"), middlewares, a)).Methods("GET") } else { // TODO: remove this after migration is done r.PathPrefix(WithBase("/assets")).Handler(http.HandlerFunc(NewMiddlewareChain(ServeFile("/"), middlewares, a))).Methods("GET") - r.HandleFunc(WithBase("/favicon.ico"), NewMiddlewareChain(ServeFile("/assets/logo/"), middlewares, a)).Methods("GET") + r.HandleFunc(WithBase("/favicon.ico"), NewMiddlewareChain(ServeFavicon, middlewares, a)).Methods("GET") } // Other endpoints