Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

done #30

goenningc0da9e83ced2
diff --git a/app/context.go b/app/context.go
index cc78cbfef..014ef158b 100644
--- a/app/context.go
+++ b/app/context.go
@@ -47,6 +47,11 @@ func (ctx *Context) Failure(err error) error {
return echo.NewHTTPError(http.StatusInternalServerError, err)
}
+//Page returns a page with given variables
+func (ctx *Context) Page(dict echo.Map) error {
+ return ctx.Render(200, "index.html", dict)
+}
+
//Claims returns authenticated user claims
func (ctx *Context) Claims() *WechyClaims {
return ctx.Get(claimsContextKey).(*WechyClaims)
diff --git a/app/feedback/handler.go b/app/feedback/handler.go
index 940b286a3..36ba7ceb6 100644
--- a/app/feedback/handler.go
+++ b/app/feedback/handler.go
@@ -25,8 +25,8 @@ func (h AllHandlers) List() app.HandlerFunc {
return c.Failure(err)
}
- return c.Render(200, "index.html", echo.Map{
- "Ideas": ideas,
+ return c.Page(echo.Map{
+ "ideas": ideas,
})
}
}
@@ -84,9 +84,9 @@ func (h AllHandlers) Details() app.HandlerFunc {
return c.Failure(err)
}
- return c.Render(200, "idea.html", echo.Map{
- "Comments": comments,
- "Idea": idea,
+ return c.Page(echo.Map{
+ "comments": comments,
+ "idea": idea,
})
}
}
diff --git a/app/renderer.go b/app/renderer.go
index acf6c6fb5..c4226a2fc 100644
--- a/app/renderer.go
+++ b/app/renderer.go
@@ -24,9 +24,7 @@ func NewHTMLRenderer(logger echo.Logger) *HTMLRenderer {
renderer := &HTMLRenderer{nil, logger}
renderer.templates = make(map[string]*template.Template)
- //TODO: load all templates automatically
renderer.add("index.html")
- renderer.add("idea.html")
renderer.add("404.html")
renderer.add("500.html")
@@ -59,14 +57,13 @@ func (r *HTMLRenderer) Render(w io.Writer, name string, data interface{}, c echo
tmpl = r.add(name)
}
- //TODO: refactor (and move somewhere else?)
m := data.(echo.Map)
- m["AuthEndpoint"] = os.Getenv("AUTH_ENDPOINT")
- m["Tenant"] = ctx.Tenant()
+ m["authEndpoint"] = os.Getenv("AUTH_ENDPOINT")
+ m["tenant"] = ctx.Tenant()
if ctx.IsAuthenticated() {
claims := ctx.Claims()
- m["User"] = &User{
+ m["__User"] = &User{
ID: claims.UserID,
Name: claims.UserName,
Email: claims.UserEmail,
@@ -75,7 +72,7 @@ func (r *HTMLRenderer) Render(w io.Writer, name string, data interface{}, c echo
files, _ := ioutil.ReadDir("dist/js")
if len(files) > 0 {
- m["JavaScriptBundle"] = files[0].Name()
+ m["__JavaScriptBundle"] = files[0].Name()
}
return tmpl.Execute(w, m)
diff --git a/views/404.html b/views/404.html
index 6046fffe3..106044cec 100644
--- a/views/404.html
+++ b/views/404.html
@@ -4,6 +4,4 @@
{{define "javascript"}}{{end}}
-{{define "content"}}
- <h1>404: Page not found</h1>
-{{end}}
+{{define "content"}}<h1>404: Page not found</h1>{{end}}
\ No newline at end of file
diff --git a/views/500.html b/views/500.html
index 1829a8901..93b740926 100644
--- a/views/500.html
+++ b/views/500.html
@@ -1,9 +1,7 @@
{{define "title"}}
- 404: Page not found
+ 500: Oops, something unexpected happened :(
{{end}}
{{define "javascript"}}{{end}}
-{{define "content"}}
- <h1>500: Oops, something unexpected happened... :(</h1>
-{{end}}
+{{define "content"}}<h1>500: Oops, something unexpected happened... :(</h1>{{end}}
\ No newline at end of file
diff --git a/views/base.html b/views/base.html
index 1f969c8bd..a11f8c8d6 100644
--- a/views/base.html
+++ b/views/base.html
@@ -8,21 +8,14 @@
<title>{{template "title" .}}</title>
</head>
<body>
- <div id="root"></div>
-
- {{template "content" .}}
-
+ <div id="root"></div>{{template "content" .}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.0/jquery.min.js" integrity="sha256-JAW99MJVpJBGcbzEuXk4Az05s/XyDdBomFqNlM3ic+I=" crossorigin="anonymous"></script>
-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.4.2/react.min.js" integrity="sha256-Rtnfi1MVZAj3v+eDeFjh/iAXo8//D0zVKql8fjVLCiM=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.4.2/react-dom.min.js" integrity="sha256-uzKwYuH50DHzDYr3h/Bnpv7C5QJNUjHEpVmT3Xuq3ww=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.9/semantic.min.js" integrity="sha256-mq9Ru97qzOm1x5zeYFfPniWgQP9tEmjo3O4jUEJdjNY=" crossorigin="anonymous"></script>
- <script src="/assets/js/{{ .JavaScriptBundle }}"></script>
+ <script src="/assets/js/{{ .__JavaScriptBundle }}"></script>
<script type="text/javascript">
- setUser({{ .User }});
- set("authEndpoint", {{ .AuthEndpoint }});
- set("tenant", {{ .Tenant }});
- {{template "javascript" .}}
+ setUser({{ .__User }}); {{template "javascript" .}}
</script>
</body>
</html>
diff --git a/views/idea.html b/views/idea.html
deleted file mode 100644
index 0fb602e2e..000000000
--- a/views/idea.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{{define "title"}}
- {{ .Tenant.Name }}
-{{end}}
-
-{{define "javascript"}}
- set("idea", {{ .Idea }});
- set("comments", {{ .Comments }});
-{{end}}
-
-{{define "content"}}{{end}}
\ No newline at end of file
diff --git a/views/index.html b/views/index.html
index 0fe5c19db..386b7c12f 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,9 +1,8 @@
-{{define "title"}}
- {{ .Tenant.Name }}
-{{end}}
-
-{{define "javascript"}}
- set("ideas", {{ .Ideas }});
-{{end}}
+{{define "title"}}{{ .tenant.Name }}{{end}}
+
+// Print all variables that does not start with _ (95)
+// Compressed to avoid whitespace being printed
+
+{{define "javascript"}} {{ range $key, $value := . }}{{ $first := index $key 1 }}{{ if ne $first 95 }}set({{ $key }}, {{ $value }});{{ end }}{{ end }} {{end}}
{{define "content"}}{{end}}
\ No newline at end of file