From e9d507fec30a2a41933f948a117f6a5a27910177 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Mon, 14 Sep 2015 10:46:31 +0100 Subject: [PATCH] updates --- edit/edit.go | 4 ++ page/page.go | 61 ++++-------------- settings/settings.go | 94 +++++++++++++++++++++++----- static/css/main.css | 4 ++ templates/{header.tmpl => base.tmpl} | 6 ++ templates/edit.tmpl | 4 +- templates/footer.tmpl | 5 -- templates/settings.tmpl | 34 +++++----- utils/utils.go | 51 +++++++++++++++ 9 files changed, 173 insertions(+), 90 deletions(-) rename templates/{header.tmpl => base.tmpl} (91%) delete mode 100644 templates/footer.tmpl create mode 100644 utils/utils.go diff --git a/edit/edit.go b/edit/edit.go index 34abbbf7..9865d23b 100644 --- a/edit/edit.go +++ b/edit/edit.go @@ -2,6 +2,7 @@ package edit import ( "io/ioutil" + "log" "net/http" "os" "strings" @@ -24,18 +25,21 @@ func Execute(w http.ResponseWriter, r *http.Request) (int, error) { err := ioutil.WriteFile(filename, []byte(r.Form["content"][0]), 0666) if err != nil { + log.Print(err) return 500, err } commands.Execute() } else { if _, err := os.Stat(filename); os.IsNotExist(err) { + log.Print(err) return 404, nil } file, err := ioutil.ReadFile(filename) if err != nil { + log.Print(err) return 500, err } diff --git a/page/page.go b/page/page.go index 420dde73..f83063b9 100644 --- a/page/page.go +++ b/page/page.go @@ -2,52 +2,19 @@ package page import ( "html/template" + "log" "net/http" - "reflect" - "strings" - "unicode" "github.com/hacdias/caddy-hugo/assets" + "github.com/hacdias/caddy-hugo/utils" ) const ( templateExtension = ".tmpl" - headerMark = "{{#HEADER#}}" - footerMark = "{{#FOOTER#}}" ) var funcMap = template.FuncMap{ - "splitCapitalize": splitCapitalize, - "isMap": isMap, -} - -// TODO: utilspackage -func isMap(sth interface{}) bool { - return reflect.ValueOf(sth).Kind() == reflect.Map -} - -// TODO: utils package -func splitCapitalize(name string) string { - var words []string - l := 0 - for s := name; s != ""; s = s[l:] { - l = strings.IndexFunc(s[1:], unicode.IsUpper) + 1 - if l <= 0 { - l = len(s) - } - words = append(words, s[:l]) - } - - name = "" - - for _, element := range words { - name += element + " " - } - - name = strings.ToLower(name[:len(name)-1]) - name = strings.ToUpper(string(name[0])) + name[1:len(name)] - - return name + "splitCapitalize": utils.SplitCapitalize, } // Page type @@ -58,38 +25,34 @@ type Page struct { // Render the page func (p *Page) Render(name string, w http.ResponseWriter) (int, error) { - rawHeader, err := assets.Asset("templates/header" + templateExtension) + base, err := assets.Asset("templates/base" + templateExtension) if err != nil { + log.Print(err) return 500, err } - header := string(rawHeader) - - rawFooter, err := assets.Asset("templates/footer" + templateExtension) + page, err := assets.Asset("templates/" + name + templateExtension) if err != nil { + log.Print(err) return 500, err } - footer := string(rawFooter) - - rawPage, err := assets.Asset("templates/" + name + templateExtension) + tpl, err := template.New("base").Funcs(funcMap).Parse(string(base)) if err != nil { + log.Print(err) 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").Funcs(funcMap).Parse(page) + tpl, err = tpl.Parse(string(page)) if err != nil { + log.Print(err) return 500, err } - tpl.Execute(w, p) + tpl.ExecuteTemplate(w, "base", p) return 200, nil } diff --git a/settings/settings.go b/settings/settings.go index 1028dc56..82952002 100644 --- a/settings/settings.go +++ b/settings/settings.go @@ -4,11 +4,18 @@ import ( "io/ioutil" "net/http" "os" + "sort" "github.com/hacdias/caddy-hugo/page" + "github.com/hacdias/caddy-hugo/utils" "github.com/spf13/hugo/parser" ) +type settings struct { + Settings interface{} + Keys []string +} + // Execute the page func Execute(w http.ResponseWriter, r *http.Request) (int, error) { if r.Method == "POST" { @@ -27,9 +34,14 @@ func Execute(w http.ResponseWriter, r *http.Request) (int, error) { return 500, err } + // configIndex := getConfigNames(config) + + cnf := new(settings) + cnf.Settings = getConfigNames(config, "") + page := new(page.Page) - page.Title = "settings" - page.Body = config + page.Title = "Settings" + page.Body = cnf return page.Render("settings", w) } @@ -54,21 +66,6 @@ func getConfigFrontMatter() string { return frontmatter } -func getConfig(frontmatter string) (interface{}, error) { - content := getConfigFileContent(frontmatter) - - switch frontmatter { - case "yaml": - return parser.HandleYAMLMetaData(content) - case "json": - return parser.HandleJSONMetaData(content) - case "toml": - return parser.HandleTOMLMetaData(content) - } - - return []string{}, nil -} - func getConfigFileContent(frontmatter string) []byte { file, err := ioutil.ReadFile("config." + frontmatter) @@ -79,3 +76,66 @@ func getConfigFileContent(frontmatter string) []byte { return file } + +// make it generic to frontmatter. everything bellow -> new file +func getConfig(frontmatter string) (interface{}, error) { + content := getConfigFileContent(frontmatter) + // config := []string{} + + // get the config into a map + if frontmatter == "yaml" { + return parser.HandleYAMLMetaData(content) + } else if frontmatter == "json" { + return parser.HandleJSONMetaData(content) + } else if frontmatter == "toml" { + return parser.HandleTOMLMetaData(content) + } + + return []string{}, nil +} + +type conf struct { + Name string + Master string + Content interface{} + SubContent bool +} + +func getConfigNames(config interface{}, master string) interface{} { + var mapsNames []string + var stringsNames []string + + for index, element := range config.(map[string]interface{}) { + if utils.IsMap(element) { + mapsNames = append(mapsNames, index) + } else { + stringsNames = append(stringsNames, index) + } + } + + sort.Strings(mapsNames) + sort.Strings(stringsNames) + names := append(stringsNames, mapsNames...) + + settings := make([]interface{}, len(names)) + + for index := range names { + c := new(conf) + c.Name = names[index] + c.Master = master + c.SubContent = false + + i := config.(map[string]interface{})[names[index]] + + if utils.IsMap(i) { + c.Content = getConfigNames(i, c.Name) + c.SubContent = true + } else { + c.Content = i + } + + settings[index] = c + } + + return settings +} diff --git a/static/css/main.css b/static/css/main.css index 14652374..b4073cc7 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -30,3 +30,7 @@ textarea { border: 0; font-family: inherit; } + +.block { + margin: 1em 0; +} diff --git a/templates/header.tmpl b/templates/base.tmpl similarity index 91% rename from templates/header.tmpl rename to templates/base.tmpl index e140a4fa..7309b252 100644 --- a/templates/header.tmpl +++ b/templates/base.tmpl @@ -20,3 +20,9 @@
Admin
+ + {{ template "content" . }} + + + + diff --git a/templates/edit.tmpl b/templates/edit.tmpl index dfe2d4d0..38fa022d 100644 --- a/templates/edit.tmpl +++ b/templates/edit.tmpl @@ -1,4 +1,4 @@ -{{#HEADER#}} +{{ define "content" }} {{ with .Body }}
@@ -13,4 +13,4 @@
{{ end }} -{{#FOOTER#}} +{{ end }} diff --git a/templates/footer.tmpl b/templates/footer.tmpl deleted file mode 100644 index 0399fdf2..00000000 --- a/templates/footer.tmpl +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/templates/settings.tmpl b/templates/settings.tmpl index 61200fd7..1dd9c13e 100644 --- a/templates/settings.tmpl +++ b/templates/settings.tmpl @@ -1,4 +1,18 @@ -{{#HEADER#}} +{{ define "optsLoop" }} +{{ range $key, $value := . }} +{{ if $value.SubContent }} +

{{ splitCapitalize $value.Name }}

+ {{ template "optsLoop" $value.Content }} +{{ else}} + + +
+{{ end }} +{{ end }} +{{ end }} + + +{{ define "content" }} {{ with .Body }}
@@ -6,25 +20,11 @@

Settings

- {{ range $key, $value := . }} - {{ if isMap $value }} -

{{ splitCapitalize $key }}

- -
- -
- - {{ else }} - - -
- - {{ end }} - {{ end }} + {{ template "optsLoop" .Settings }}
{{ end }} -{{#FOOTER#}} +{{ end }} diff --git a/utils/utils.go b/utils/utils.go new file mode 100644 index 00000000..534c9c04 --- /dev/null +++ b/utils/utils.go @@ -0,0 +1,51 @@ +package utils + +import ( + "errors" + "reflect" + "strings" + "unicode" +) + +// Dict allows to send more than one variable into a template +func Dict(values ...interface{}) (map[string]interface{}, error) { + if len(values)%2 != 0 { + return nil, errors.New("invalid dict call") + } + dict := make(map[string]interface{}, len(values)/2) + for i := 0; i < len(values); i += 2 { + key, ok := values[i].(string) + if !ok { + return nil, errors.New("dict keys must be strings") + } + dict[key] = values[i+1] + } + return dict, nil +} + +func IsMap(sth interface{}) bool { + return reflect.ValueOf(sth).Kind() == reflect.Map +} + +func SplitCapitalize(name string) string { + var words []string + l := 0 + for s := name; s != ""; s = s[l:] { + l = strings.IndexFunc(s[1:], unicode.IsUpper) + 1 + if l <= 0 { + l = len(s) + } + words = append(words, s[:l]) + } + + name = "" + + for _, element := range words { + name += element + " " + } + + name = strings.ToLower(name[:len(name)-1]) + name = strings.ToUpper(string(name[0])) + name[1:len(name)] + + return name +}