Code refactoring

handlers/gopherjs.go

@@ -0,0 +1,14 @@
+package handlers
+
+import (
+	"net/http"
+	"os"
+)
+
+func GopherjsScriptHandler(w http.ResponseWriter, r *http.Request) {
+	http.ServeFile(w, r, os.Getenv("ISOGO_APP_ROOT")+"/client/client.js")
+}
+
+func GopherjsScriptMapHandler(w http.ResponseWriter, r *http.Request) {
+	http.ServeFile(w, r, os.Getenv("ISOGO_APP_ROOT")+"/client/client.js.map")
+}

handlers/index.go

@@ -0,0 +1,12 @@
+package handlers
+
+import (
+	"net/http"
+	"os"
+
+	"github.com/isomorphicgo/isogoapp/view"
+)
+
+func IndexHandler(w http.ResponseWriter, r *http.Request) {
+	view.RenderTemplate(w, os.Getenv("ISOGO_APP_ROOT")+"/templates/index.html", nil)
+}

isogoapp.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"fmt"
-	"html/template"
-	"log"
 	"net/http"
 	"os"
 
 	"github.com/gorilla/mux"
+	"github.com/isomorphicgo/isogoapp/handlers"
 )
 
+<<<<<<< HEAD
 var webappRoot string = os.Getenv("ISOGO_APP_ROOT")
 
 func indexHandler(w http.ResponseWriter, r *http.Request) {
@@ -33,19 +33,22 @@ func gopherjsScriptHandler(w http.ResponseWriter, r *http.Request) {
 func gopherjsScriptMapHandler(w http.ResponseWriter, r *http.Request) {
 	http.ServeFile(w, r, webappRoot+"/client/client.js.map")
 }
+=======
+var WebAppRoot string = os.Getenv("ISOGO_APP_ROOT")
+>>>>>>> 1f58dae263ab74226133033f55a2a449b05b4683
 
 func main() {
 
-	if webappRoot == "" {
+	if WebAppRoot == "" {
 		fmt.Println("The ISOGO_APP_ROOT environment variable must be set before the web server instance can be started.")
 		os.Exit(1)
 	}
 
-	fs := http.FileServer(http.Dir(webappRoot + "/static"))
+	fs := http.FileServer(http.Dir(WebAppRoot + "/static"))
 	r := mux.NewRouter()
-	r.HandleFunc("/", indexHandler)
-	r.HandleFunc("/js/client.js", gopherjsScriptHandler)
-	r.HandleFunc("/js/client.js.map", gopherjsScriptMapHandler)
+	r.HandleFunc("/", handlers.IndexHandler)
+	r.HandleFunc("/js/client.js", handlers.GopherjsScriptHandler)
+	r.HandleFunc("/js/client.js.map", handlers.GopherjsScriptMapHandler)
 	http.Handle("/", r)
 	http.Handle("/static/", http.StripPrefix("/static", fs))
 	http.ListenAndServe(":8080", nil)

view/render.go

@@ -0,0 +1,17 @@
+package view
+
+import (
+	"html/template"
+	"log"
+	"net/http"
+)
+
+// Template rendering function
+func RenderTemplate(w http.ResponseWriter, templateFile string, templateData interface{}) {
+
+	t, err := template.ParseFiles(templateFile)
+	if err != nil {
+		log.Fatal("Error encountered while parsing the template: ", err)
+	}
+	t.Execute(w, templateData)
+}