瀏覽代碼

Upgrade to stuffbin v1.0.0

Kailash Nadh 6 年之前
父節點
當前提交
61c2a728ca
共有 3 個文件被更改,包括 5 次插入3 次删除
  1. 1 1
      go.mod
  2. 2 0
      go.sum
  3. 2 2
      main.go

+ 1 - 1
go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/jordan-wright/email v0.0.0-20181027021455-480bedc4908b
 	github.com/jordan-wright/email v0.0.0-20181027021455-480bedc4908b
 	github.com/knadh/goyesql v1.1.1
 	github.com/knadh/goyesql v1.1.1
 	github.com/knadh/koanf v0.4.2
 	github.com/knadh/koanf v0.4.2
-	github.com/knadh/stuffbin v0.0.0-20190103171338-6379e949be48
+	github.com/knadh/stuffbin v1.0.0
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/gommon v0.2.7 // indirect
 	github.com/labstack/gommon v0.2.7 // indirect
 	github.com/lib/pq v1.0.0
 	github.com/lib/pq v1.0.0

+ 2 - 0
go.sum

@@ -26,6 +26,8 @@ github.com/knadh/koanf v0.4.2 h1:A/bb9+eRoHHHQ57O6y66vzRCYui915CK3FdDYzNs56Q=
 github.com/knadh/koanf v0.4.2/go.mod h1:Qd5yvXN39ZzjoRJdXMKN2QqHzQKhSx/K8fU5gyn4LPs=
 github.com/knadh/koanf v0.4.2/go.mod h1:Qd5yvXN39ZzjoRJdXMKN2QqHzQKhSx/K8fU5gyn4LPs=
 github.com/knadh/stuffbin v0.0.0-20190103171338-6379e949be48 h1:lRb28d0+iiVwqF7Li25IJXjNRaVCQPH6n/fHwk9Qo+E=
 github.com/knadh/stuffbin v0.0.0-20190103171338-6379e949be48 h1:lRb28d0+iiVwqF7Li25IJXjNRaVCQPH6n/fHwk9Qo+E=
 github.com/knadh/stuffbin v0.0.0-20190103171338-6379e949be48/go.mod h1:afUOPBWr6bZ09aS3wbSOqXVGaO6rKcyvXYTcuG9LYpI=
 github.com/knadh/stuffbin v0.0.0-20190103171338-6379e949be48/go.mod h1:afUOPBWr6bZ09aS3wbSOqXVGaO6rKcyvXYTcuG9LYpI=
+github.com/knadh/stuffbin v1.0.0 h1:NQon6PTpLXies4bRFhS3VpLCf6y+jn6YVXU3i2wPQ+M=
+github.com/knadh/stuffbin v1.0.0/go.mod h1:yVCFaWaKPubSNibBsTAJ939q2ABHudJQxRWZWV5yh+4=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.7 h1:2qOPq/twXDrQ6ooBGrn3mrmVOC+biLlatwgIu8lbzRM=
 github.com/labstack/gommon v0.2.7 h1:2qOPq/twXDrQ6ooBGrn3mrmVOC+biLlatwgIu8lbzRM=

+ 2 - 2
main.go

@@ -223,7 +223,7 @@ func main() {
 		importNotifCB)
 		importNotifCB)
 
 
 	// Read system e-mail templates.
 	// Read system e-mail templates.
-	notifTpls, err := stuffbin.ParseTemplatesGlob(fs, "/email-templates/*.html")
+	notifTpls, err := stuffbin.ParseTemplatesGlob(nil, fs, "/email-templates/*.html")
 	if err != nil {
 	if err != nil {
 		logger.Fatalf("error loading system e-mail templates: %v", err)
 		logger.Fatalf("error loading system e-mail templates: %v", err)
 	}
 	}
@@ -269,7 +269,7 @@ func main() {
 	})
 	})
 
 
 	// Parse user facing templates.
 	// Parse user facing templates.
-	tpl, err := stuffbin.ParseTemplatesGlob(fs, "/public/templates/*.html")
+	tpl, err := stuffbin.ParseTemplatesGlob(nil, fs, "/public/templates/*.html")
 	if err != nil {
 	if err != nil {
 		logger.Fatalf("error parsing public templates: %v", err)
 		logger.Fatalf("error parsing public templates: %v", err)
 	}
 	}