Add routing for basic web ui

server/app/app.go

@@ -0,0 +1,33 @@
+package app
+
+import (
+	"net/http"
+
+	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server"
+	"github.com/go-chi/chi"
+)
+
+type Router struct {
+	ds   model.DataStore
+	mux  http.Handler
+	path string
+}
+
+func New(ds model.DataStore, path string) *Router {
+	r := &Router{ds: ds, path: path}
+	r.mux = r.routes()
+	return r
+}
+
+func (app *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	app.mux.ServeHTTP(w, r)
+}
+
+func (app *Router) routes() http.Handler {
+	r := chi.NewRouter()
+	server.FileServer(r, app.path, "/", http.Dir("ui/build"))
+	r.Get("/ping", func(w http.ResponseWriter, r *http.Request) { w.Write([]byte(`{"response":"pong"}`)) })
+
+	return r
+}

server/fileserver.go

@@ -0,0 +1,47 @@
+package server
+
+import (
+	"net/http"
+	"os"
+	"strings"
+
+	"github.com/go-chi/chi"
+)
+
+func FileServer(r chi.Router, fullPath, subPath string, root http.FileSystem) {
+	if strings.ContainsAny(fullPath, "{}*") {
+		panic("FileServer does not permit URL parameters.")
+	}
+
+	fs := http.StripPrefix(fullPath, http.FileServer(justFilesFilesystem{root}))
+
+	if subPath != "/" && subPath[len(subPath)-1] != '/' {
+		r.Get(subPath, http.RedirectHandler(fullPath+"/", 302).ServeHTTP)
+		subPath += "/"
+	}
+	subPath += "*"
+
+	r.Get(subPath, func(w http.ResponseWriter, r *http.Request) {
+		fs.ServeHTTP(w, r)
+	})
+}
+
+type justFilesFilesystem struct {
+	fs http.FileSystem
+}
+
+func (fs justFilesFilesystem) Open(name string) (http.File, error) {
+	f, err := fs.fs.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	return neuteredReaddirFile{f}, nil
+}
+
+type neuteredReaddirFile struct {
+	http.File
+}
+
+func (f neuteredReaddirFile) Readdir(count int) ([]os.FileInfo, error) {
+	return nil, nil
+}

server/server.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/cloudsonic/sonic-server/conf"
@@ -34,7 +33,7 @@ func New(scanner *scanner.Scanner) *Server {
 }
 
 func (a *Server) MountRouter(path string, subRouter http.Handler) {
-	log.Info("Mounting API", "path", path)
+	log.Info("Mounting routes", "path", path)
 	a.router.Group(func(r chi.Router) {
 		r.Use(middleware.Logger)
 		r.Mount(path, subRouter)
@@ -58,11 +57,12 @@ func (a *Server) initRoutes() {
 	r.Use(InjectLogger)
 
 	r.Get("/", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/Jamstash", 302)
+		http.Redirect(w, r, "/app", 302)
 	})
+
 	workDir, _ := os.Getwd()
 	filesDir := filepath.Join(workDir, "Jamstash-master/dist")
-	FileServer(r, "/Jamstash", http.Dir(filesDir))
+	FileServer(r, "/Jamstash", "/Jamstash", http.Dir(filesDir))
 
 	a.router = r
 }
@@ -81,24 +81,6 @@ func (a *Server) initScanner() {
 	}()
 }
 
-func FileServer(r chi.Router, path string, root http.FileSystem) {
-	if strings.ContainsAny(path, "{}*") {
-		panic("FileServer does not permit URL parameters.")
-	}
-
-	fs := http.StripPrefix(path, http.FileServer(root))
-
-	if path != "/" && path[len(path)-1] != '/' {
-		r.Get(path, http.RedirectHandler(path+"/", 301).ServeHTTP)
-		path += "/"
-	}
-	path += "*"
-
-	r.Get(path, func(w http.ResponseWriter, r *http.Request) {
-		fs.ServeHTTP(w, r)
-	})
-}
-
 func InjectLogger(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()