Merge pull request #2 from gopherjs/simplify

dmitshur · dmitshur · commit d8346f8cff30 · 2015-10-07T16:15:09.000-07:00
Simplify code, instructions in README.
diff --git a/README.md b/README.md
@@ -1,39 +1,33 @@
 # Gopherpen
 
-This is a template project that will let you easily get started with GopherJS. It includes some simple HTML, CSS, and Go code for the frontend. Make some changes, and refresh in browser to see results. When there are errors in your frontend Go code, they will show up in the dev console.
+This is a project template that will let you easily get started with GopherJS for building a web app. It includes some simple HTML, CSS, and Go code for the frontend. Make some changes, and refresh in browser to see results. When there are errors in your frontend Go code, they will show up in the browser console.
 
-Once you're done making changes, you can create a static production binary that has all assets built in, and can be deployed to any server.
+Once you're done making changes, you can easily create a fully self-contained static production binary.
 
 ## Installation
 
-Run this to get gopherpen and all dependencies, both for development and production modes.
+Get the source code for gopherpen and all dependencies, both for production and development modes:
 
-```
-go get -u github.com/gopherjs/gopherpen
-go get -u -tags=dev github.com/gopherjs/gopherpen
-```
-
-To run `go generate`, you'll also need:
-
-```
-go get -u github.com/shurcooL/vfsgen
+```bash
+go get -u -d github.com/gopherjs/gopherpen/...
+go get -u -d -tags=generate github.com/gopherjs/gopherpen/...
 ```
 
 ## Building
 
 ### Development Build
 
-Accesses assets from disk directly.
+Accesses assets from disk directly:
 
-```
+```bash
 go build -tags=dev
 ```
 
 ### Production Build
 
-All assets are statically embedded in the binary, so it can run standalone in any folder.
+All assets are statically embedded in the binary, so it can run standalone in any folder:
 
-```
+```bash
 go generate
 go build
 ```
diff --git a/assets/index.html.tmpl b/assets/index.html.tmpl
@@ -1,7 +1,10 @@
 <html>
 	<head>
 		<link href="/assets/style.css" rel="stylesheet" type="text/css" />
-		<script src="/assets/script/script.js" type="text/javascript"></script>
 	</head>
-	<body>A beginning.</body>
+	<body>
+		<p>Hello, world of {{.Animals}}!</p>
+
+		<script src="/assets/script/script.js" type="text/javascript"></script>
+	</body>
 </html>
diff --git a/assets/script/main.go b/assets/script/main.go
@@ -2,6 +2,8 @@
 
 package main
 
+import "fmt"
+
 func main() {
-	println("Script is working!")
+	fmt.Println("Script is working! Try making some changes to it.")
 }
diff --git a/assets_gen.go b/assets_gen.go
@@ -1,4 +1,4 @@
-// +build ignore
+// +build generate
 
 package main
 
diff --git a/assets_vfsdata.go b/assets_vfsdata.go
diff --git a/main.go b/main.go
@@ -7,37 +7,34 @@ import (
 	"log"
 	"net/http"
 	"strings"
-	"sync"
 
 	"github.com/shurcooL/go/gzip_file_server"
 	"github.com/shurcooL/httpfs/html/vfstemplate"
 )
 
 var httpFlag = flag.String("http", ":8080", "Listen for HTTP connections on this address.")
 
-var t *template.Template
-
-func loadTemplates() error {
-	var err error
-	t = template.New("").Funcs(template.FuncMap{})
-	t, err = vfstemplate.ParseGlob(assets, t, "/assets/*.tmpl")
-	return err
-}
-
-var state struct {
-	mu sync.Mutex
+func loadTemplates() (*template.Template, error) {
+	t := template.New("").Funcs(template.FuncMap{})
+	t, err := vfstemplate.ParseGlob(assets, t, "/assets/*.tmpl")
+	return t, err
 }
 
 func mainHandler(w http.ResponseWriter, req *http.Request) {
-	if err := loadTemplates(); err != nil {
+	t, err := loadTemplates()
+	if err != nil {
 		log.Println("loadTemplates:", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-	state.mu.Lock()
-	err := t.ExecuteTemplate(w, "index.html.tmpl", &state)
-	state.mu.Unlock()
+	var data = struct {
+		Animals string
+	}{
+		Animals: "gophers",
+	}
+
+	err = t.ExecuteTemplate(w, "index.html.tmpl", data)
 	if err != nil {
 		log.Println("t.Execute:", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -48,17 +45,12 @@ func mainHandler(w http.ResponseWriter, req *http.Request) {
 func main() {
 	flag.Parse()
 
-	err := loadTemplates()
-	if err != nil {
-		log.Fatalln("loadTemplates:", err)
-	}
-
-	http.Handle("/favicon.ico", http.NotFoundHandler())
 	http.HandleFunc("/", mainHandler)
 	http.Handle("/assets/", gzip_file_server.New(assets))
+	http.Handle("/favicon.ico", http.NotFoundHandler())
 
 	printServingAt(*httpFlag)
-	err = http.ListenAndServe(*httpFlag, nil)
+	err := http.ListenAndServe(*httpFlag, nil)
 	if err != nil {
 		log.Fatalln("ListenAndServe:", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`package main`
`4`	`4`
	`5`	`+import "fmt"`
	`6`	`+`
`5`	`7`	`func main() {`
`6`		`- println("Script is working!")`
	`8`	`+ fmt.Println("Script is working! Try making some changes to it.")`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build ignore`
	`1`	`+// +build generate`
`2`	`2`
`3`	`3`	`package main`
`4`	`4`