Include base path in static resource URLs (#260)

bluekeyes · web-flow · commit 71ccb32fcc73 · 2021-01-18T09:35:24.000-08:00
diff --git a/server/handler/frontend.go b/server/handler/frontend.go
@@ -17,6 +17,7 @@ package handler
 import (
 	"html/template"
 	"net/http"
+	"path"
 	"sort"
 	"strings"
 
@@ -35,8 +36,15 @@ type FilesConfig struct {
 	Templates string `yaml:"templates"`
 }
 
-func LoadTemplates(c *FilesConfig) (templatetree.HTMLTree, error) {
+func LoadTemplates(c *FilesConfig, basePath string) (templatetree.HTMLTree, error) {
+	if basePath == "" {
+		basePath = "/"
+	}
+
 	root := template.New("root").Funcs(template.FuncMap{
+		"resource": func(r string) string {
+			return path.Join(basePath, "static", r)
+		},
 		"titlecase": strings.Title,
 		"sortByStatus": func(results []*common.Result) []*common.Result {
 			r := make([]*common.Result, len(results))
diff --git a/server/server.go b/server/server.go
@@ -161,7 +161,7 @@ func New(c *Config) (*Server, error) {
 		),
 	)
 
-	templates, err := handler.LoadTemplates(&c.Files)
+	templates, err := handler.LoadTemplates(&c.Files, basePath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to load templates")
 	}
diff --git a/server/templates/details.html.tmpl b/server/templates/details.html.tmpl
@@ -2,7 +2,7 @@
 {{define "title"}}{{.PullRequest.GetBase.GetRepo.GetFullName}}#{{.PullRequest.GetNumber}} - Details | PolicyBot{{end}}
 
 {{define "scripts"}}
-<script defer src="/static/js/filter.js"></script>
+<script defer src="{{ resource "js/filter.js" }}"></script>
 {{end}}
 
 {{define "body-class"}}bg-light-gray5 text-dark-gray1 flex flex-col h-screen{{end}}
diff --git a/server/templates/page.html.tmpl b/server/templates/page.html.tmpl
@@ -6,8 +6,8 @@
 
     <title>{{block "title" .}}PolicyBot{{end}}</title>
 
-    <link rel="icon" href="/static/img/favicon.ico" />
-    <link rel="stylesheet" href="/static/css/main.css">
+    <link rel="icon" href="{{ resource "img/favicon.ico" }}" />
+    <link rel="stylesheet" href="{{ resource "css/main.css" }}">
     {{block "scripts" .}}{{end}}
   </head>
   <body class="{{block "body-class" .}}bg-light-gray5 text-dark-gray1{{end}}">

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func New(c Config) (Server, error) {`
`161`	`161`	`),`
`162`	`162`	`)`
`163`	`163`
`164`		`- templates, err := handler.LoadTemplates(&c.Files)`
	`164`	`+ templates, err := handler.LoadTemplates(&c.Files, basePath)`
`165`	`165`	`if err != nil {`
`166`	`166`	`return nil, errors.Wrap(err, "failed to load templates")`
`167`	`167`	`}`