frontmatter parsing better; edit not working

edit/edit.go

@@ -7,13 +7,16 @@ import (
 	"os"
 	"strings"
 
+	"github.com/hacdias/caddy-hugo/frontmatter"
 	"github.com/hacdias/caddy-hugo/page"
 	"github.com/spf13/hugo/commands"
+	"github.com/spf13/hugo/parser"
 )
 
-type fileInfo struct {
+type information struct {
-	Content string
 	Name        string
+	Content     string
+	FrontMatter interface{}
 }
 
 // Execute sth
@@ -36,21 +39,28 @@ func Execute(w http.ResponseWriter, r *http.Request) (int, error) {
 			return 404, nil
 		}
 
-		file, err := ioutil.ReadFile(filename)
+		reader, err := os.Open(filename)
 
 		if err != nil {
 			log.Print(err)
 			return 500, err
 		}
 
-		inf := new(fileInfo)
+		file, err := parser.ReadFrom(reader)
-		inf.Content = string(file)
+
-		inf.Name = filename
+		inf := new(information)
+		inf.Content = string(file.Content())
+		inf.FrontMatter, err = frontmatter.Pretty(file.FrontMatter())
+
+		if err != nil {
+			log.Print(err)
+			return 500, err
+		}
 
 		page := new(page.Page)
 		page.Title = "Edit"
 		page.Body = inf
-		return page.Render(w, r, "edit")
+		return page.Render(w, r, "edit", "frontmatter")
 	}
 
 	return 200, nil

frontmatter/frontmatter.go

@@ -8,24 +8,15 @@ import (
 )
 
 // Pretty creates a new FrontMatter object
-func Pretty(content []byte, language string) (interface{}, error) {
+func Pretty(content []byte) (interface{}, error) {
-	var err error
+	frontType := parser.DetectFrontMatter(rune(content[0]))
-	var c interface{}
+	front, err := frontType.Parse(content)
-
-	if language == "yaml" {
-		c, err = parser.HandleYAMLMetaData(content)
-	} else if language == "json" {
-		c, err = parser.HandleJSONMetaData(content)
-	} else if language == "toml" {
-		c, err = parser.HandleTOMLMetaData(content)
-	}
 
 	if err != nil {
 		return []string{}, err
 	}
 
-	//log.Print(c)
+	return rawToPretty(front, ""), nil
-	return rawToPretty(c, ""), nil
 }
 
 type frontmatter struct {

settings/settings.go

@@ -59,7 +59,7 @@ func Execute(w http.ResponseWriter, r *http.Request) (int, error) {
 			return 500, err
 		}
 
-		f, err := frontmatter.Pretty(content, language)
+		f, err := frontmatter.Pretty(content)
 
 		if err != nil {
 			log.Print(err)

static/css/main.css

@@ -4,30 +4,50 @@ body {
   height: 100%;
   width: 100%;
 }
+
 header {
   position: fixed;
   top: 0;
   left: 0;
   height: 3em;
   width: 100%;
-    background-color: #212121;
+  background-color: #EEE;
   padding: 0 2em;
   box-sizing: border-box;
   z-index: 999;
-    color: #fff;
+  color: #555;
 }
-header nav {} header nav ul {
+
+header nav {}
+
+header nav ul {
   margin: 0;
   padding: 0;
+  display: -webkit-box;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -moz-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -ms-flexbox;
+  /* TWEENER - IE 10 */
+  display: -webkit-flex;
+  /* NEW - Chrome */
+  display: flex;
 }
+
 header nav ul li {
   list-style-type: none;
   display: inline-block;
   vertical-align: middle;
 }
+
+header nav ul li:last-child {
+  margin-left: auto;
+}
+
 header nav img {
   height: 2em;
 }
+
 header nav ul li a {
   padding: 0.5em 0.5em;
   line-height: 2em;
@@ -36,18 +56,22 @@ header nav ul li a {
   color: inherit;
   transition: .5s ease background-color;
 }
+
 header nav ul li a:hover {
-    background-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.57);
 }
+
 main {
   top: 3em;
   position: relative;
 }
+
 .content {
   margin: 1.5em auto;
   width: 80%;
   max-width: 800px;
 }
+
 textarea {
   width: 100%;
   min-height: 50em;
@@ -56,15 +80,19 @@ textarea {
   font-family: inherit;
 }
 
+
 /* FORMS */
 
-form {
+form {}
-
-}
 
 form input {
-
+  color: rgba(0, 0, 0, 0.41);
-color: rgba(0, 0, 0, 0.41);width: 15em;line-height: 1.25em;margin: .5em 0;border: 1px solid #fff;transition: .5s ease-out all;}
+  width: 15em;
+  line-height: 1.25em;
+  margin: .5em 0;
+  border: 1px solid #fff;
+  transition: .5s ease-out all;
+}
 
 form input:focus {
   color: inherit;
@@ -73,4 +101,6 @@ form input:focus {
 }
 
 form label {
-width: 10.5em;display: inline-block;}
+  width: 10.5em;
+  display: inline-block;
+}

static/js/app.js

@@ -17,7 +17,26 @@ $(document).ready(function() {
 
     event.preventDefault();
   });
+
+  $("#logout").click(function(e) {
+    e.preventDefault();
+    jQuery.ajax({
+        type: "GET",
+        url: "/admin",
+        async: false,
+        username: "logmeout",
+        password: "123456",
+        headers: {
+          "Authorization": "Basic xxx"
+        }
+      })
+      .fail(function() {
+        window.location = "/";
       });
+    return false;
+  });
+});
+
 
 $.fn.serializeField = function() {
   var result = {};
@@ -28,8 +47,7 @@ $.fn.serializeField = function() {
 
       if ($this.is("fieldset") && name) {
         result[name] = $this.serializeField();
-        }
+      } else {
-        else {
         $.each($this.serializeArray(), function() {
           result[this.name] = this.value;
         });

templates/base_full.tmpl

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html class="no-js" lang="en">
+
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -11,6 +12,7 @@
 
   <link rel="stylesheet" href="/admin/static/css/normalize.css">
   <link rel="stylesheet" href="/admin/static/css/main.css">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
   <script src="/admin/static/js/app.js"></script>
@@ -20,10 +22,11 @@
   <header>
     <nav>
       <ul>
-        <li><img src="/admin/static/hugo.png"></li>
+        <li><a href="/"><i class="fa fa-home fa-lg"></i> Home</a></li>
-        <li><a href="/admin/browse/content">Content</a></li>
+        <li><a href="/admin/browse/content"><i class="fa fa-newspaper-o"></i> Content</a></li>
-        <li><a href="/admin/browse">Browse</a></li>
+        <li><a href="/admin/browse"><i class="fa fa-folder-o"></i> Browse</a></li>
-        <li><a href="/admin/settings">Settings</a></li>
+        <li><a href="/admin/settings"><i class="fa fa-cog"></i> Settings</a></li>
+        <li><a id="logout" href="#logout"><i class="fa fa-sign-out"></i> Logout</a></li>
       </ul>
     </nav>
   </header>
@@ -34,4 +37,5 @@
 
   </footer>
 </body>
+
 </html>

templates/edit.tmpl

@@ -1,16 +1,14 @@
-{{ define "content" }}
+{{ define "content" }} {{ with .Body }}
-{{ with .Body }}
 
 <div class="content">
-
   <h1>Editing {{ .Name }}</h1>
 
   <form method="POST" action="">
+    {{ template "frontmatter" .FrontMatter }}
     <textarea name="content">{{ .Content }}</textarea>
     <input type="submit" value="Save">
   </form>
 
 </div>
 
-{{ end }}
+{{ end }} {{ end }}
-{{ end }}