best routing, static files embedding

README.md

@@ -1,3 +1,7 @@
 # Hugo add-on for Caddy
 
 This is an add-on for Caddy which wants to deliver a good UI to edit the content of the website.
+
+```
+go-bindata -pkg assets -o assets/assets.go static/ templates/
+```

edit/edit.go

@@ -4,9 +4,12 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+
+	"github.com/hacdias/caddy-hugo/page"
 )
 
-type Page struct {
+type editPage struct {
+	Var1 string
 }
 
 // Execute sth
@@ -14,15 +17,23 @@ func Execute(w http.ResponseWriter, r *http.Request, file string) (int, error) {
 	if r.Method == "POST" {
 		// it's saving the post
 	} else {
-		// check if the file exists
 		if _, err := os.Stat(file); os.IsNotExist(err) {
 			return 404, nil
 		}
 
-		file, _ := ioutil.ReadFile(file)
+		file, err := ioutil.ReadFile(file)
 
-		// render the template here
-		w.Write([]byte(string(file)))
+		if err != nil {
+			return 500, err
+		}
+
+		editInfo := new(editPage)
+		editInfo.Var1 = string(file)
+
+		page := new(page.Info)
+		page.Title = "Edit"
+		page.Body = editInfo
+		return page.Render("edit", w)
 	}
 
 	return 200, nil

hugo.go

@@ -1,14 +1,27 @@
+//go:generate go-bindata -pkg assets -o assets/assets.go static/css/ templates/
+
 package hugo
 
 import (
 	"net/http"
+	"strings"
 
-	"github.com/hacdias/caddy-hugo/routing"
+	"github.com/hacdias/caddy-hugo/assets"
+	"github.com/hacdias/caddy-hugo/edit"
 	"github.com/mholt/caddy/config/setup"
 	"github.com/mholt/caddy/middleware"
 	"github.com/spf13/hugo/commands"
 )
 
+const (
+	mainURL     string = "/admin"
+	contentURL  string = mainURL + "/content"
+	browseURL   string = mainURL + "/browse"
+	editURL     string = mainURL + "/edit"
+	settingsURL string = mainURL + "/settings"
+	assetsURL   string = mainURL + "/assets"
+)
+
 // Setup function
 func Setup(c *setup.Controller) (middleware.Middleware, error) {
 	commands.Execute()
@@ -21,9 +34,47 @@ func Setup(c *setup.Controller) (middleware.Middleware, error) {
 type handler struct{ Next middleware.Handler }
 
 func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
-	if middleware.Path(r.URL.Path).Matches("/admin") {
-		return routing.Route(w, r)
+	if urlMatch(r, "/admin") {
+		return route(w, r)
 	}
 
 	return h.Next.ServeHTTP(w, r)
 }
+
+func route(w http.ResponseWriter, r *http.Request) (int, error) {
+	if urlMatch(r, contentURL) {
+		// content folder management
+		w.Write([]byte("Show Content Folder"))
+	} else if urlMatch(r, browseURL) {
+		// browse files
+		w.Write([]byte("Show Data Folder"))
+	} else if urlMatch(r, editURL) {
+		// edit file
+		return edit.Execute(w, r, strings.Replace(r.URL.Path, editURL+"/", "", 1))
+	} else if urlMatch(r, settingsURL) {
+		// edit settings
+		w.Write([]byte("Settings Page"))
+
+	} else if urlMatch(r, assetsURL) {
+		// assets like css, javascript and images
+		fileName := strings.Replace(r.URL.Path, assetsURL, "static", 1)
+		file, err := assets.Asset(fileName)
+
+		if err != nil {
+			return 404, nil
+		}
+
+		w.Write(file)
+	} else if r.URL.Path == mainURL || r.URL.Path == mainURL+"/" {
+		// dashboard
+		w.Write([]byte("Dashboard"))
+	} else {
+		return 404, nil
+	}
+
+	return 200, nil
+}
+
+func urlMatch(r *http.Request, str string) bool {
+	return middleware.Path(r.URL.Path).Matches(str)
+}

page/page.go

@@ -0,0 +1,59 @@
+package page
+
+import (
+	"html/template"
+	"net/http"
+	"strings"
+
+	"github.com/hacdias/caddy-hugo/assets"
+)
+
+const (
+	templateExtension = ".tmpl"
+	headerMark        = "{{#HEADER#}}"
+	footerMark        = "{{#FOOTER#}}"
+)
+
+// Info type
+type Info struct {
+	Title string
+	Body  interface{}
+}
+
+// Render the page
+func (p *Info) Render(name string, w http.ResponseWriter) (int, error) {
+	rawHeader, err := assets.Asset("templates/header" + templateExtension)
+
+	if err != nil {
+		return 500, err
+	}
+
+	header := string(rawHeader)
+
+	rawFooter, err := assets.Asset("templates/footer" + templateExtension)
+
+	if err != nil {
+		return 500, err
+	}
+
+	footer := string(rawFooter)
+
+	rawPage, err := assets.Asset("templates/" + name + templateExtension)
+
+	if err != nil {
+		return 500, err
+	}
+
+	page := string(rawPage)
+	page = strings.Replace(page, headerMark, header, -1)
+	page = strings.Replace(page, footerMark, footer, -1)
+
+	tpl, err := template.New("page").Parse(page)
+
+	if err != nil {
+		return 500, err
+	}
+
+	tpl.Execute(w, p)
+	return 200, nil
+}

routing/routing.go

@@ -1,42 +0,0 @@
-package routing
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/hacdias/caddy-hugo/edit"
-	"github.com/mholt/caddy/middleware"
-)
-
-const (
-	mainURL     string = "/admin"
-	contentURL  string = mainURL + "/content"
-	dataURL     string = mainURL + "/data"
-	editURL     string = mainURL + "/edit"
-	newURL      string = mainURL + "/new"
-	settingsURL string = mainURL + "/settings"
-	staticURL   string = mainURL + "/static"
-)
-
-// Route the admin path
-func Route(w http.ResponseWriter, r *http.Request) (int, error) {
-	if middleware.Path(r.URL.Path).Matches(contentURL) {
-		w.Write([]byte("Show Content Folder"))
-	} else if middleware.Path(r.URL.Path).Matches(dataURL) {
-		w.Write([]byte("Show Data Folder"))
-	} else if middleware.Path(r.URL.Path).Matches(editURL) {
-		return edit.Execute(w, r, strings.Replace(r.URL.Path, editURL+"/", "", 1))
-	} else if middleware.Path(r.URL.Path).Matches(newURL) {
-		w.Write([]byte("New Thing Page"))
-	} else if middleware.Path(r.URL.Path).Matches(settingsURL) {
-		w.Write([]byte("Settings Page"))
-	} else if middleware.Path(r.URL.Path).Matches(staticURL) {
-		w.Write([]byte("Static things management"))
-	} else if r.URL.Path == mainURL || r.URL.Path == mainURL+"/" {
-		w.Write([]byte("Dashboard"))
-	} else {
-		return 404, nil
-	}
-
-	return 200, nil
-}

static/css/normalize.css

@@ -0,0 +1,427 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}

templates/edit.tmpl

@@ -0,0 +1,5 @@
+{{#HEADER#}}
+
+<textarea>{{ .Body.Var1 }}</textarea>
+
+{{#FOOTER#}}

templates/edit_form.tpl

@@ -1,7 +0,0 @@
-{{ define "Head" }}
-{{ template "head" }}
-{{ end }}
-
-{{define "Body"}}
-{{ .Content }}
-{{ end }}

templates/footer.tmpl

@@ -0,0 +1,5 @@
+<footer>
+
+</footer>
+</body>
+</html>

templates/head.tpl

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html class="no-js" lang="en_UK">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>{{ .Title }}</title>
-  <link rel="icon" href="/favicon.ico" type="image/x-icon">
-  <link rel="stylesheet" href="">
-</head>

templates/header.tmpl

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class="no-js" lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="theme-color" content="#fff">
+    <title>{{ .Title }}</title>
+    <link rel="stylesheet" href="/admin/assets/css/normalize.css">
+    <link rel="stylesheet" href="/admin/assets/css/main.css">
+  </head>
+
+  <body>