github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

frontmatter parsing better; edit not working

pull/20/head
Henrique Dias 2015-09-14 22:03:09 +01:00
parent 3b0d8380cb
commit 234e2a1ec4
7 changed files with 161 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
edit/edit.go
View File

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

17
frontmatter/frontmatter.go
View File

@ -8,24 +8,15 @@ import (
) )
// Pretty creates a new FrontMatter object // 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 { if err != nil {
return []string{}, err return []string{}, err
} }
//log.Print(c) return rawToPretty(front, ""), nil
return rawToPretty(c, ""), nil
} }
type frontmatter struct { type frontmatter struct {

2
settings/settings.go
View File

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

122
static/css/main.css
View File

@ -1,76 +1,106 @@
body { body {
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
color: #212121; color: #212121;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
header { header {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
height: 3em; height: 3em;
width: 100%; width: 100%;
background-color: #212121; background-color: #EEE;
padding: 0 2em; padding: 0 2em;
box-sizing: border-box; box-sizing: border-box;
z-index: 999; z-index: 999;
color: #fff; color: #555;
} }
header nav {} header nav ul {
margin: 0; header nav {}
padding: 0;
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 { header nav ul li {
list-style-type: none; list-style-type: none;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
header nav ul li:last-child {
margin-left: auto;
}
header nav img { header nav img {
height: 2em; height: 2em;
} }
header nav ul li a { header nav ul li a {
padding: 0.5em 0.5em; padding: 0.5em 0.5em;
line-height: 2em; line-height: 2em;
display: block; display: block;
text-decoration: none; text-decoration: none;
color: inherit; color: inherit;
transition: .5s ease background-color; transition: .5s ease background-color;
} }
header nav ul li a:hover { header nav ul li a:hover {
background-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0.57);
} }
main { main {
top: 3em; top: 3em;
position: relative; position: relative;
} }
.content { .content {
margin: 1.5em auto; margin: 1.5em auto;
width: 80%; width: 80%;
max-width: 800px; max-width: 800px;
} }
textarea { textarea {
width: 100%; width: 100%;
min-height: 50em; min-height: 50em;
resize: vertical; resize: vertical;
border: 0; border: 0;
font-family: inherit; font-family: inherit;
} }
/* FORMS */ /* FORMS */
form { form {}
}
form input { 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 { form input:focus {
color: inherit; color: inherit;
outline: 0; outline: 0;
border-bottom: 1px solid #2196F3; border-bottom: 1px solid #2196F3;
} }
form label { form label {
width: 10.5em;display: inline-block;} width: 10.5em;
display: inline-block;
}

60
static/js/app.js
View File

@ -4,11 +4,11 @@ $(document).ready(function() {
var url = $(this).attr('action') var url = $(this).attr('action')
$.ajax({ $.ajax({
type : 'POST', type: 'POST',
url : url, url: url,
data : data, data: data,
dataType : 'json', dataType: 'json',
encode : true, encode: true,
}).done(function(data) { }).done(function(data) {
alert("it workss"); alert("it workss");
}).fail(function(data) { }).fail(function(data) {
@ -17,24 +17,42 @@ $(document).ready(function() {
event.preventDefault(); 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 = {};
this.each(function() {
$(this).find("> *").each(function() {
var $this = $(this);
var name = $this.attr("name");
if ($this.is("fieldset") && name) { $.fn.serializeField = function() {
result[name] = $this.serializeField(); var result = {};
} this.each(function() {
else { $(this).find("> *").each(function() {
$.each($this.serializeArray(), function() { var $this = $(this);
result[this.name] = this.value; var name = $this.attr("name");
});
} if ($this.is("fieldset") && name) {
}); result[name] = $this.serializeField();
} else {
$.each($this.serializeArray(), function() {
result[this.name] = this.value;
});
}
}); });
return result; });
return result;
}; };

32
templates/base_full.tmpl
View File

@ -1,29 +1,32 @@
<!DOCTYPE html> <!DOCTYPE html>
<html class="no-js" lang="en"> <html class="no-js" lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#fff"> <meta name="theme-color" content="#fff">
<title>{{ .Title }}</title> <title>{{ .Title }}</title>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,700,400italic,700italic' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/admin/static/css/normalize.css"> <link rel="stylesheet" href="/admin/static/css/normalize.css">
<link rel="stylesheet" href="/admin/static/css/main.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="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="/admin/static/js/app.js"></script> <script src="/admin/static/js/app.js"></script>
</head> </head>
<body> <body>
<header> <header>
<nav> <nav>
<ul> <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> </ul>
</nav> </nav>
</header> </header>
@ -34,4 +37,5 @@
</footer> </footer>
</body> </body>
</html> </html>

8
templates/edit.tmpl
View File

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