Added Template Helpers Structure and functionality

Added helpers: css, js

Author: mrLSD

.travis.yml

@@ -9,8 +9,6 @@ before_install:
   - go get github.com/gavv/httpexpect
   - go get github.com/spf13/viper
 script:
-
-
   - go build server.go
 matrix:
   allow_failures:

libs/renderer.go

@@ -3,6 +3,7 @@ package libs
 import (
 	"github.com/labstack/echo"
 	"html/template"
+	"github.com/mrlsd/echo-cms/libs/template_helpers"
 	"io"
 )
 
@@ -16,7 +17,7 @@ func (t *Template) Render(w io.Writer, name string, data interface{}, c echo.Con
 
 func SetRenderer(e *echo.Echo, path string) {
 	t := &Template{
-		templates: template.Must(template.ParseGlob(path)),
+		templates: template.Must(template.New("main").Funcs(libs.Helpers()).ParseGlob(path)),
 	}
 	e.Renderer = t
 }

libs/template_helpers/html.go

@@ -0,0 +1,23 @@
+package libs
+
+import ("fmt"
+"html/template"
+)
+
+func CssHelper(args ...interface{}) template.HTML {
+	var content string
+	content = ""
+	if len(args) > 0 {
+		content = fmt.Sprintf("<link rel=\"stylesheet\" href=\"%s\">", args[0])
+	}
+	return  template.HTML(content)
+}
+
+func JsHelper(args ...interface{}) template.HTML {
+	var content string
+	content = ""
+	if len(args) > 0 {
+		content = fmt.Sprintf("<script src=\"%s\"></script>", args[0])
+	}
+	return  template.HTML(content)
+}

libs/template_helpers/main.go

@@ -0,0 +1,12 @@
+package libs
+
+import (
+	"html/template"
+)
+
+func Helpers() template.FuncMap {
+	return template.FuncMap{
+		"css": CssHelper,
+		"js": JsHelper,
+	}
+}

modules/backend/controllers/main.go

@@ -85,5 +85,5 @@ func PostForm(c echo.Context) error {
 }
 
 func GetLogin(c echo.Context) error {
-	return c.Render(http.StatusOK, "admin/login", nil)
+	return c.Render(http.StatusOK, "login/main", nil)
 }

modules/backend/views/login/main.html

@@ -0,0 +1,3 @@
+{{ define "login/main" }}
+<h1>Login page</h1>
+{{ end }}

server.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"github.com/labstack/echo"
-	"github.com/labstack/gommon/log"
+	//"github.com/labstack/gommon/log"
 
-	"github.com/labstack/echo/middleware"
+	//"github.com/labstack/echo/middleware"
 	"github.com/mrlsd/echo-cms/config"
 	"github.com/mrlsd/echo-cms/libs"
 	"github.com/mrlsd/echo-cms/modules/backend"
@@ -19,16 +19,16 @@ func main() {
 	backend.UrlRules(e)
 	e.Static("/", "static")
 
-	e.Debug = true
-	e.Logger.SetLevel(log.DEBUG)
+	//e.Debug = true
+	//e.Logger.SetLevel(log.DEBUG)
 	e.HTTPErrorHandler = libs.CustomHTTPErrorHandler
 
-	e.Pre(middleware.NonWWWRedirect())
-	e.Use(middleware.Secure())
+	//e.Pre(middleware.NonWWWRedirect())
+	//e.Use(middleware.Secure())
 	//e.Use(middleware.CSRF())
 	//e.Use(middleware.Logger())
-	e.Use(middleware.Recover())
-	e.Use(middleware.BodyLimit("2M"))
+	//e.Use(middleware.Recover())
+	//e.Use(middleware.BodyLimit("2M"))
 
 	e.Logger.Fatal(e.Start(":3000"))
 }

test.sh

@@ -0,0 +1,10 @@
+rm -rf *.coverprofile
+i=0
+for Package in $(go list ./... | grep -v "vendor")
+do
+	(( i = i + 1 ))
+	go test -v -covermode=count -coverprofile=$i.coverprofile $Package
+done
+gocovmerge *.coverprofile > merged.coverprofile
+go tool cover -html=merged.coverprofile
+rm -rf *.coverprofile