Bump to /v2 (#5)

* merge with main; weird css/js issues if rollup-assets is enabled

* add EnableCollectionNavi() method; remove inline CSS/JS from navi_collection.html

---------

Co-authored-by: thisisaaronland <thisisaaronland@localhost>

Makefile

@@ -1,18 +1,20 @@
+GOMOD=readonly
+
 vuln:
 	govulncheck ./...
 
 debug:
 	@make css
 	@make js
-	go run -mod vendor cmd/example/main.go
+	go run -mod $(GOMOD) cmd/example/main.go -javascript-at-eof -rollup-assets
 
 local-scan:
 	/usr/local/sfomuseum/bin/sonar-scanner/bin/sonar-scanner -Dsonar.projectKey=go-http-sfomuseum -Dsonar.sources=. -Dsonar.host.url=http://localhost:9000 -Dsonar.login=$(TOKEN)
 
 lambda:
 	if test -f main; then rm -f main; fi
 	if test -f example.zip; then rm -f example.zip; fi
-	GOOS=linux go build -mod vendor -o main cmd/example/main.go
+	GOOS=linux go build -mod $(GOMOD) -o main cmd/example/main.go
 	zip example.zip main
 	rm -f main
 
@@ -42,7 +44,7 @@ js-sfom:
 	cat static/javascript/js_-CPIpBjXzxABQv31RXcqizSgaLzthEF_xbzTZvR1Nak.pruned.js >> static/javascript/sfomuseum.org.js
 	echo "\n" >> static/javascript/sfomuseum.org.js 
 	echo "});" >> static/javascript/sfomuseum.org.js
-	go run -mod vendor cmd/minify/main.go -media-type text/js static/javascript/sfomuseum.org.js > static/javascript/sfomuseum.org.min.js
+	minify static/javascript/sfomuseum.org.js > static/javascript/sfomuseum.org.min.js
 
 js-deps:
 	echo "// This file was generated by robots\n\n" > static/javascript/sfomuseum.org.deps.min.js
@@ -54,5 +56,5 @@ js-deps:
 	cat static/javascript/superfish.min.js >> static/javascript/sfomuseum.org.deps.min.js
 
 css:
-	go run -mod vendor cmd/minify/main.go -media-type text/css static/css/sfomuseum.org.base.css static/css/sfomuseum.org.bootstrap.css > static/css/sfomuseum.org.min.css
-	go run -mod vendor cmd/minify/main.go -media-type text/css static/css/sfomuseum.common.css static/css/sfomuseum.common.grid.css static/css/sfomuseum.common.media.css > static/css/sfomuseum.common.min.css
+	minify static/css/sfomuseum.org.base.css static/css/sfomuseum.org.bootstrap.css > static/css/sfomuseum.org.min.css
+	minify static/css/sfomuseum.common.css static/css/sfomuseum.common.grid.css static/css/sfomuseum.common.media.css > static/css/sfomuseum.common.min.css

cmd/example/main.go

@@ -4,13 +4,14 @@ package main
 import (
 	"context"
 	"errors"
-	"github.com/aaronland/go-http-server"
-	"github.com/sfomuseum/go-flags/flagset"
-	"github.com/sfomuseum/go-http-sfomuseum"
-	"github.com/sfomuseum/go-http-sfomuseum/templates/html"
 	"html/template"
 	"log"
 	"net/http"
+
+	"github.com/aaronland/go-http-server"
+	"github.com/sfomuseum/go-flags/flagset"
+	"github.com/sfomuseum/go-http-sfomuseum/v2"
+	"github.com/sfomuseum/go-http-sfomuseum/v2/templates/html"
 )
 
 // ExampleVars is struct containing template variables for the example website.
@@ -48,6 +49,9 @@ func main() {
 
 	server_uri := fs.String("server-uri", "http://localhost:8080", "A valid aaronland/go-http-server URI.")
 
+	js_eof := fs.Bool("javascript-at-eof", false, "Append JavaScript resources to end of HTML file.")
+	rollup_assets := fs.Bool("rollup-assets", false, "Rollup (minify and bundle) JavaScript and CSS assets.")
+
 	flagset.Parse(fs)
 
 	err := flagset.SetFlagsFromEnvVars(fs, "EXAMPLE")
@@ -66,14 +70,19 @@ func main() {
 
 	mux := http.NewServeMux()
 
-	err = sfomuseum.AppendAssetHandlers(mux)
+	sfomuseum_opts := sfomuseum.DefaultSFOMuseumOptions()
+
+	sfomuseum_opts.EnableCollectionNavi()
+
+	sfomuseum_opts.AppendJavaScriptAtEOF = *js_eof
+	sfomuseum_opts.RollupAssets = *rollup_assets
+
+	err = sfomuseum.AppendAssetHandlers(mux, sfomuseum_opts)
 
 	if err != nil {
 		log.Fatalf("Failed to append SFOMuseum assets handler, %v", err)
 	}
 
-	sfomuseum_opts := sfomuseum.DefaultSFOMuseumOptions()
-
 	example_vars := &ExampleVars{
 		Title: "Example",
 	}

go.mod

@@ -1,20 +1,23 @@
-module github.com/sfomuseum/go-http-sfomuseum
+module github.com/sfomuseum/go-http-sfomuseum/v2
 
-go 1.19
+go 1.18
 
 require (
-	github.com/aaronland/go-http-bootstrap v0.2.0
-	github.com/aaronland/go-http-rewrite v1.0.1
-	github.com/aaronland/go-http-server v1.0.0
+	github.com/aaronland/go-http-bootstrap v0.4.0
+	github.com/aaronland/go-http-server v1.0.1
+	github.com/aaronland/go-http-static v0.0.3
 	github.com/sfomuseum/go-flags v0.10.0
-	github.com/sfomuseum/go-template v1.2.1
-	github.com/tdewolff/minify/v2 v2.12.4
+	github.com/sfomuseum/go-http-rollup v0.0.2
+	github.com/sfomuseum/go-template v1.5.1
 )
 
 require (
+	github.com/aaronland/go-http-rewrite v1.1.0 // indirect
+	github.com/aaronland/go-log/v2 v2.0.0 // indirect
 	github.com/aaronland/go-roster v1.0.0 // indirect
-	github.com/akrylysov/algnhsa v0.12.1 // indirect
-	github.com/aws/aws-lambda-go v1.9.0 // indirect
+	github.com/akrylysov/algnhsa v1.0.0 // indirect
+	github.com/aws/aws-lambda-go v1.37.0 // indirect
+	github.com/tdewolff/minify/v2 v2.12.4 // indirect
 	github.com/tdewolff/parse/v2 v2.6.4 // indirect
-	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
 )

go.sum

@@ -1,38 +1,41 @@
-github.com/aaronland/go-http-bootstrap v0.2.0 h1:eNIppbaFJvTDEbF+vJ5xFBZEgMhcDbvrcWSJfB1tK/w=
-github.com/aaronland/go-http-bootstrap v0.2.0/go.mod h1:Dd4Z7H55XdgB7JyVma3cFvKQZDdyCaOo/0Dl7qjAu/A=
-github.com/aaronland/go-http-rewrite v1.0.1 h1:BWUlr88wN+jQJUGFd5sSl5fysxHlLYN0FB330pRRP+Q=
-github.com/aaronland/go-http-rewrite v1.0.1/go.mod h1:DVpymWnsPZI9P2cmgs6lz2cWiUltfDJ6UNOwuvSXyF0=
-github.com/aaronland/go-http-server v1.0.0 h1:AF+4JLEyXNj7Mulpcx8yaek1RWGojWOQMg5vinEDDVs=
-github.com/aaronland/go-http-server v1.0.0/go.mod h1:gJ2TDOB9EhK8IULIf3UqVYcv1TaEa5N2er9YaBvD2M0=
+github.com/aaronland/go-http-bootstrap v0.4.0 h1:W+wXKbJvpT7eW3hjjLNXDfJy980+G/xju6Y4S2VD7Kk=
+github.com/aaronland/go-http-bootstrap v0.4.0/go.mod h1:v71tU1uyr8cSInBOV2vhnaV+l3bQ/yEtkPvchD1Ho64=
+github.com/aaronland/go-http-rewrite v1.1.0 h1:HhsltNyYRnIz2FR+qANZLx2ykiRuNuNK1JgPonKBLHQ=
+github.com/aaronland/go-http-rewrite v1.1.0/go.mod h1:iA9jQBureJrzO6fTzmRLS+fkbAI1Fna71iTb1hP8n3k=
+github.com/aaronland/go-http-server v1.0.1 h1:ULzPl1cinglgIDd1fRV02WFRUrG4Sv1LW06rGasLHqA=
+github.com/aaronland/go-http-server v1.0.1/go.mod h1:sg3+O9NJREN2YTChO5e2sdjmuhFJKTH39u+HV5V8Bpo=
+github.com/aaronland/go-http-static v0.0.3 h1:0MnYXNwGVDCzre5YwinfPSdAFHInbBbmBv5hJtb/FX8=
+github.com/aaronland/go-http-static v0.0.3/go.mod h1:/s6lHGXq95ZR9nMJmE9slE4uMi92GP34CuG3f9xlfsY=
+github.com/aaronland/go-log/v2 v2.0.0 h1:lMoaVDHd4Etaz2+ibze3ReqvHHG68z2SpuxYXv12WlE=
+github.com/aaronland/go-log/v2 v2.0.0/go.mod h1:jOLBCaHVyOC7DQpbVFFQSiuU8CA8MRMrqA1mMSJQtLs=
 github.com/aaronland/go-roster v1.0.0 h1:FRDGrTqsYySKjWnAhbBGXyeGlI/o5/t9FZYCbUmyQtI=
 github.com/aaronland/go-roster v1.0.0/go.mod h1:KIsYZgrJlAsyb9LsXSCvlqvbcCBVjCSqcQiZx42i9ro=
-github.com/akrylysov/algnhsa v0.12.1 h1:A9Ojt4hZrL77mhBc3qGO3Sn9reyf+tvM3DmR0SfXguc=
-github.com/akrylysov/algnhsa v0.12.1/go.mod h1:xAcJ/X8DV+81e+dUjIoB/r5CbISrSXV9//leoMDHcdk=
-github.com/aws/aws-lambda-go v1.9.0 h1:r9TWtk8ozLYdMW+aelUeWny8z2mjghJCMx6/uUwOLNo=
-github.com/aws/aws-lambda-go v1.9.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A=
+github.com/akrylysov/algnhsa v1.0.0 h1:qlogYL9n7MfU/TJJJCKqpg6gLgCuR/IkdFGwIJClBnE=
+github.com/akrylysov/algnhsa v1.0.0/go.mod h1:ConzNpk7uLAl7Hi5LqcImgl3Oq2flRe6W7zum5A1p/8=
+github.com/aws/aws-lambda-go v1.37.0 h1:WXkQ/xhIcXZZ2P5ZBEw+bbAKeCEcb5NtiYpSwVVzIXg=
+github.com/aws/aws-lambda-go v1.37.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM=
 github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sfomuseum/go-flags v0.10.0 h1:1OC1ACxpWMsl3XQ9OeNVMQj7Zi2CzufP3Rym3mPI8HU=
 github.com/sfomuseum/go-flags v0.10.0/go.mod h1:VXOnnX1/yxQpX2yiwHaBV6aCmhtszQOL5bL1/nNo3co=
-github.com/sfomuseum/go-template v1.2.1 h1:vetza00Hf3TP3sW8c2B/++WMInCzBdwAQaPH3TQY78E=
-github.com/sfomuseum/go-template v1.2.1/go.mod h1:JRpTSqjgYv6+PdkoVbX5GmuyCQqnRLd0Yk8LFvLb6/k=
+github.com/sfomuseum/go-http-rollup v0.0.2 h1:cc0p0pppG1VJc6o3IUdkbocPnJedRzOqxWFNlz2mkYM=
+github.com/sfomuseum/go-http-rollup v0.0.2/go.mod h1:kxVTXkkaUsxVAMq3lFSNoILzKkv1L4ETuaQiDCQcBfI=
+github.com/sfomuseum/go-template v1.5.1 h1:al8tyls02fgDChAIJnGEBonaw8vMykjUuQn7Gi0Rx0M=
+github.com/sfomuseum/go-template v1.5.1/go.mod h1:JRpTSqjgYv6+PdkoVbX5GmuyCQqnRLd0Yk8LFvLb6/k=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
 github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE=
 github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk=
 github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ=
 github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs=
 github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM=
 github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=