refactor to leverage templates with define and block keywords, improved style

johnpfeiffer · johnpfeiffer · commit b6da397f89c8 · 2018-05-10T00:02:36.000-07:00
diff --git a/base.tmpl b/base.tmpl
@@ -0,0 +1,16 @@
+<html>
+<head>
+<style type="text/css">
+{{block "style" .}}
+body{
+  font-family: "Georgia";
+  font-size: 1.9em;
+}
+{{end}}
+</style>
+</head>
+<body>
+{{block "content" .}}
+{{end}}
+</body>
+</html>
diff --git a/components.tmpl b/components.tmpl
@@ -0,0 +1,6 @@
+{{define "tablestyle"}}
+  table, th, td {
+    border: 2px solid black;
+    font-size: 2.5em;
+  }
+{{end}}
diff --git a/hexcolors.go b/hexcolors.go
@@ -13,7 +13,7 @@ type HexColors struct {
 
 // GetHexTemplate returns the parsed file as a template object
 func GetHexTemplate() *template.Template {
-	return template.Must(template.ParseFiles("hexcolorstemplate.html"))
+	return template.Must(template.ParseFiles("base.tmpl", "components.tmpl", "hexcolorstemplate.html"))
 }
 
 func hexController(w http.ResponseWriter, r *http.Request) {
diff --git a/hexcolorstemplate.html b/hexcolorstemplate.html
@@ -1,16 +1,11 @@
-<html>
-  <head><style>
-        table, th, td {
-    border: 2px solid black;
-  }
-  </style></head>
-  <body>
+{{define "style"}}
+{{template "tablestyle" .}}
+{{end}}
+
+{{define "content"}}
   <table>
     {{range .Colors}}
-    <tr>
-      <td>{{.}}</td><td style="background-color: {{.}}; ">__</td>
-    </tr>
+    <tr><td>{{.}}</td><td style="background-color: {{.}}; ">__</td></tr>
     {{end}}
-    </table>
-</body>
-</html>
+  </table>
+{{end}}
diff --git a/index.html b/index.html
@@ -0,0 +1,3 @@
+{{define "content"}}
+hi , try <a href="/hexcolors">hexcolors</a>
+{{end}}
diff --git a/indextemplate.go b/indextemplate.go
@@ -7,21 +7,6 @@ type NoData struct{}
 
 // GetIndexTemplate returns the index.html template https://golang.org/pkg/html/template/#Template
 func GetIndexTemplate() *template.Template {
-	var indexTemplate = template.Must(template.New("index").Parse(`<html>
-<head>
-<title>Example Go Web App</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style type="text/css">
-body{    
-  font-family: "Georgia";
-  font-size: 1.9em;
-}
-</style>
-</head>
-<body>
-hi , try <a href="/hexcolors">hexcolors</a>
-</body>
-</html>
-`))
+	indexTemplate := template.Must(template.ParseFiles("base.tmpl", "index.html"))
 	return indexTemplate
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ type HexColors struct {`
`13`	`13`
`14`	`14`	`// GetHexTemplate returns the parsed file as a template object`
`15`	`15`	`func GetHexTemplate() *template.Template {`
`16`		`- return template.Must(template.ParseFiles("hexcolorstemplate.html"))`
	`16`	`+ return template.Must(template.ParseFiles("base.tmpl", "components.tmpl", "hexcolorstemplate.html"))`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func hexController(w http.ResponseWriter, r *http.Request) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{{define "content"}}`
	`2`	`+hi , try <a href="/hexcolors">hexcolors</a>`
	`3`	`+{{end}}`