Template processing

6 files changed, 25 insertions, 14 deletions

diff --git a/cmd/server/handlers.go b/cmd/server/handlers.go
index b4d4625..7ec8b24 100644
--- a/cmd/server/handlers.go
+++ b/cmd/server/handlers.go
@@ -1,17 +1,22 @@
 package main
 
 import (
+	"html/template"
 	"net/http"
 )
 
 func handleIndex() http.HandlerFunc {
+	tmplHome := loadTemplateMust("home")
+	tmplNav := loadTemplateMust("partials/navMain")
+	tmplLayout := loadTemplateMust("layout")
+	tmpl := template.Must(template.New("layout").Parse(string(tmplLayout)))
+	_ = template.Must(tmpl.Parse(string(tmplHome)))
+	_ = template.Must(tmpl.Parse(string(tmplNav)))
+	debug(tmpl)
+
 	return func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/html")
-		b, err := loadTemplate("example")
-		if err != nil {
-			panic(err)
-		}
-		w.Write(b)
+		tmpl.Execute(w, nil)
 	}
 }
 
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 3a98e59..2c3ab4f 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/middleware"
 	_ "github.com/jackc/pgx/stdlib"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
@@ -89,6 +90,12 @@ func main() {
 	}
 
 	r := chi.NewRouter()
+	r.Use(middleware.RequestID)
+	r.Use(middleware.RealIP)
+	if *verbose {
+		r.Use(middleware.Logger)
+	}
+	r.Use(middleware.Recoverer)
 
 	domainCtx := getDomainCtx(st)
 
diff --git a/counter/sws.js b/counter/sws.js
index 2048878..08c353a 100644
--- a/counter/sws.js
+++ b/counter/sws.js
@@ -8,7 +8,7 @@ var me = document.currentScript
 console.log('me:', me)
 console.log('me.sws:', me.dataset.sws)
 
-_sws = _sws || {async:false}
+_sws = _sws || {xhr:true}
 console.log('_sws:', _sws)
 _sws.d = _sws.d || me.dataset.sws || 'http://sws.userspace.com.au/sws.gif'
 console.log('using', _sws.d)
@@ -20,7 +20,7 @@ function send (p, obj) {
       return esc(k) + '=' + esc(obj[k])
     })
     .join('&')
-  if (_sws.async) {
+  if (_sws.xhr) {
     var r = new w.XMLHttpRequest()
     r.open('GET', p + '?' + qs, true)
     r.send()
diff --git a/go.mod b/go.mod
index 805ef30..cd629af 100644
--- a/go.mod
+++ b/go.mod
@@ -23,4 +23,6 @@ require (
 	src.userspace.com.au/templates v0.0.0-20200213053211-f58212f65bbd
 )
 
+replace src.userspace.com.au/templates => ../templates
+
 go 1.13
diff --git a/go.sum b/go.sum
index 4815ccb..2e8a4c1 100644
--- a/go.sum
+++ b/go.sum
@@ -39,9 +39,11 @@ github.com/wcharczuk/go-chart v2.0.1+incompatible/go.mod h1:PF5tmL4EIx/7Wf+hEkpC
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65 h1:+rhAzEzT3f4JtomfC371qB+0Ola2caSKcY69NUBZrRQ=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
@@ -50,5 +52,3 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 src.userspace.com.au/go-migrate v0.0.0-20200208102934-cf11cf76db3f h1:Vdn/5kMeLXWfkXF/wm9lioSBASBn02aA5DeVjLAYjLM=
 src.userspace.com.au/go-migrate v0.0.0-20200208102934-cf11cf76db3f/go.mod h1:QaSWOcvGubR8TBPs8XgLN67muYgAKnmIgHAaQk5ZR1c=
-src.userspace.com.au/templates v0.0.0-20200213053211-f58212f65bbd h1:HcLcXSsjkoApMBlmRmXmUOuOgf2aV+4lL+ievxmUAzM=
-src.userspace.com.au/templates v0.0.0-20200213053211-f58212f65bbd/go.mod h1:lB6Vdw9R/8jR8CzvPxfQ8ryBwpNDni1fCdeRjj90gxA=
diff --git a/templates/gen.go b/templates/gen.go
index 84db44c..fb0faf7 100644
--- a/templates/gen.go
+++ b/templates/gen.go
@@ -9,11 +9,8 @@ import (
 )
 
 func main() {
-	tmpl, err := templates.New()
-	if err != nil {
-		panic(err)
-	}
-	if _, err = tmpl.WriteTo(os.Stdout); err != nil {
+	tmpl := templates.Must(templates.New())
+	if _, err := tmpl.WriteTo(os.Stdout); err != nil {
 		panic(err)
 	}
 }