diff --git a/cmd/invertergui/main.go b/cmd/invertergui/main.go index c41eefe..3c48803 100644 --- a/cmd/invertergui/main.go +++ b/cmd/invertergui/main.go @@ -38,13 +38,13 @@ import ( "net/http" "os" - "github.com/diebietse/invertergui/frontend" "github.com/diebietse/invertergui/mk2core" "github.com/diebietse/invertergui/mk2driver" "github.com/diebietse/invertergui/plugins/cli" "github.com/diebietse/invertergui/plugins/munin" "github.com/diebietse/invertergui/plugins/prometheus" "github.com/diebietse/invertergui/plugins/webui" + "github.com/diebietse/invertergui/plugins/webui/static" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/tarm/serial" ) @@ -70,7 +70,7 @@ func main() { mu := munin.NewMunin(core.NewSubscription()) prometheus.NewPrometheus(core.NewSubscription()) - http.Handle("/", frontend.NewStatic()) + http.Handle("/", static.New()) http.Handle("/ws", http.HandlerFunc(gui.ServeHub)) http.Handle("/munin", http.HandlerFunc(mu.ServeMuninHTTP)) http.Handle("/muninconfig", http.HandlerFunc(mu.ServeMuninConfigHTTP)) diff --git a/frontend/binary.go b/plugins/webui/static/binary.go similarity index 59% rename from frontend/binary.go rename to plugins/webui/static/binary.go index a42ec02..2bc68d0 100644 --- a/frontend/binary.go +++ b/plugins/webui/static/binary.go @@ -1,4 +1,4 @@ -package frontend +package static import ( "github.com/rakyll/statik/fs" @@ -7,7 +7,8 @@ import ( "net/http" ) -func NewStatic() http.Handler { +// New exports the static part of the webgui that is served via statik +func New() http.Handler { statikFs, err := fs.New() if err != nil { log.Fatal(err) diff --git a/frontend/root/css/bootstrap.min.css b/plugins/webui/static/root/css/bootstrap.min.css similarity index 100% rename from frontend/root/css/bootstrap.min.css rename to plugins/webui/static/root/css/bootstrap.min.css diff --git a/frontend/root/css/bootstrap.min.css.map b/plugins/webui/static/root/css/bootstrap.min.css.map similarity index 100% rename from frontend/root/css/bootstrap.min.css.map rename to plugins/webui/static/root/css/bootstrap.min.css.map diff --git a/frontend/root/favicon.ico b/plugins/webui/static/root/favicon.ico similarity index 100% rename from frontend/root/favicon.ico rename to plugins/webui/static/root/favicon.ico diff --git a/frontend/root/index.html b/plugins/webui/static/root/index.html similarity index 100% rename from frontend/root/index.html rename to plugins/webui/static/root/index.html diff --git a/frontend/root/js/controller.js b/plugins/webui/static/root/js/controller.js similarity index 100% rename from frontend/root/js/controller.js rename to plugins/webui/static/root/js/controller.js diff --git a/frontend/root/js/vue.js b/plugins/webui/static/root/js/vue.js similarity index 100% rename from frontend/root/js/vue.js rename to plugins/webui/static/root/js/vue.js diff --git a/frontend/statik.go b/plugins/webui/static/statik.go similarity index 99% rename from frontend/statik.go rename to plugins/webui/static/statik.go index c1add66..300eccf 100644 --- a/frontend/statik.go +++ b/plugins/webui/static/statik.go @@ -1,7 +1,7 @@ // Code generated by statik. DO NOT EDIT. // Package statik contains static assets. -package frontend +package static import ( "github.com/rakyll/statik/fs"