Move admin ui into embedded package, update ui routes to work with em…

…bedded content, update makefile

Makefile

@@ -22,4 +22,4 @@ docker:
 	sudo docker run -u "$(ID):$(GID)" --rm -t -v `pwd`:/wag wag_builder
 
 .build_ui:
-	cd adminui/src; npm install; gulp build
+	cd adminui/frontend; npm run build

adminui/frontend/embed.go

@@ -0,0 +1,53 @@
+package frontend
+
+import (
+	"embed"
+	"io"
+	"io/fs"
+	"net/http"
+)
+
+var (
+	//go:embed dist/assets/*
+	adminResources embed.FS
+
+	//go:embed dist/index.html dist/favicon.ico
+	index embed.FS
+
+	distFiles = must(fs.Sub(adminResources, "dist"))
+)
+
+func must(f fs.FS, err error) fs.FS {
+	if err != nil {
+		panic(err)
+	}
+
+	return f
+}
+
+func Index(w http.ResponseWriter, r *http.Request) {
+
+	f, err := index.Open("dist/index.html")
+	if err != nil {
+		panic(err)
+	}
+
+	w.Header().Set("content-type", "text/html; charset=utf-8")
+	io.Copy(w, f)
+}
+
+func Favicon(w http.ResponseWriter, r *http.Request) {
+
+	f, err := index.Open("dist/favicon.ico")
+	if err != nil {
+		panic(err)
+	}
+
+	w.Header().Set("content-type", "image/x-icon")
+	io.Copy(w, f)
+}
+
+func Assets(w http.ResponseWriter, r *http.Request) {
+
+	http.StripPrefix("/", http.FileServer(http.FS(distFiles))).ServeHTTP(w, r)
+}

adminui/ui_webserver.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/NHAS/session"
+	"github.com/NHAS/wag/adminui/frontend"
 	"github.com/NHAS/wag/internal/config"
 	"github.com/NHAS/wag/internal/data"
 	"github.com/NHAS/wag/internal/router"
@@ -182,6 +183,12 @@ func New(firewall *router.Firewall, errs chan<- error) (ui *AdminUI, err error)
 		protectedRoutes := http.NewServeMux()
 		allRoutes := http.NewServeMux()
 
+		allRoutes.HandleFunc("/", frontend.Index)
+		allRoutes.HandleFunc("GET /index.html", frontend.Index)
+
+		allRoutes.HandleFunc("GET /favicon.ico", frontend.Favicon)
+		allRoutes.HandleFunc("GET /assets/", frontend.Assets)
+
 		allRoutes.HandleFunc("POST /api/login", adminUI.doLogin)
 		allRoutes.HandleFunc("POST /api/refresh", adminUI.doAuthRefresh)
 
@@ -197,7 +204,7 @@ func New(firewall *router.Firewall, errs chan<- error) (ui *AdminUI, err error)
 			allRoutes.HandleFunc("/login/oidc/callback", adminUI.oidcCallback)
 		}
 
-		allRoutes.Handle("/", adminUI.sessionManager.AuthorisationChecks(protectedRoutes,
+		allRoutes.Handle("/api/", adminUI.sessionManager.AuthorisationChecks(protectedRoutes,
 			func(w http.ResponseWriter, r *http.Request) {
 				http.Error(w, "Unauthorized", http.StatusUnauthorized)
 			},