增加模板目录的配置

增加渲染模板页面的方法
qichengzx · Jan 25, 2018 · 86cb87d · 86cb87d
1 parent ab39fdc
commit 86cb87d
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+public/
diff --git a/_config.toml b/_config.toml
@@ -10,4 +10,8 @@ category_dir = "categories"
 
 # Pagination
 per_page = 10
-pagination_dir = "page"
+pagination_dir = "page"
+
+# Theme
+theme_dir = "themes"
+theme = "unnamed"
diff --git a/config/provider.go b/config/provider.go
@@ -16,6 +16,9 @@ type Config struct {
 
 	PerPage       int    `toml:"per_page"`
 	PaginationDir string `toml:"pagination_dir"`
+
+	ThemeDir string `toml:"theme_dir"`
+	Theme    string `toml:"theme"`
 }
 
 func NewProvider(f string) *Config {

diff --git a/themes/unnamed/layout/layout.html b/themes/unnamed/layout/layout.html
@@ -0,0 +1,16 @@
+{{ define "layout" }}
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title>
+		{{ if eq .CurrentPage "index" }}
+		{{ .Cfg.Title }}
+		{{ end }}
+	</title>
+</head>
+<body>
+Hello World.
+</body>
+</html>
+{{ end }}
diff --git a/xlib/x.go b/xlib/x.go
@@ -1,6 +1,8 @@
 package xlib
 
 import (
+	"bytes"
+	"html/template"
 	"math"
 	"path/filepath"
 	"x/config"
@@ -42,5 +44,20 @@ func (s *Site) Build() {
 	}
 
 	clearDir(s.Cfg.PublicDir)
-	makeFile([]byte("hello"), filepath.Join(s.Cfg.PublicDir, indexPage))
+
+	bt := s.renderPage()
+	makeFile(bt, filepath.Join(s.Cfg.PublicDir, indexPage))
+}
+
+func (s *Site) renderPage() []byte {
+	var doc bytes.Buffer
+
+	var t = filepath.Join(s.Cfg.ThemeDir, s.Cfg.Theme, "/layout/*.html")
+	tmpl, err := template.ParseGlob(t)
+	if err != nil {
+		panic(err)
+	}
+	tmpl.ExecuteTemplate(&doc, "layout", s)
+
+	return []byte(doc.String())
 }