feat: theme directory

README.md

@@ -34,7 +34,7 @@ admin/      | 后台目录
 auth/       | 授权管理
 client/     | 博客客户端
 exception/  | 异常处理
-front/      | 博客主题
+themes/     | 主题目录
 gateway     | 网关接口层
 modules/    | 公共模块
 protocols/  | 协议定义

server/main.go

@@ -16,11 +16,11 @@ import (
 	"github.com/movsb/taoblog/admin"
 	"github.com/movsb/taoblog/auth"
 	"github.com/movsb/taoblog/exception"
-	"github.com/movsb/taoblog/front"
 	"github.com/movsb/taoblog/gateway"
 	"github.com/movsb/taoblog/service"
 	"github.com/movsb/taoblog/setup/migration"
-	"github.com/movsb/taoblog/weekly"
+	"github.com/movsb/taoblog/themes/front"
+	"github.com/movsb/taoblog/themes/weekly"
 )
 
 func main() {
@@ -75,9 +75,9 @@ func main() {
 
 	switch themeName := os.Getenv("THEME"); themeName {
 	case "BLOG":
-		front.NewFront(theService, theAuth, router.Group("/blog"), theAPI)
+		front.NewFront(theService, theAuth, router.Group("/blog"), theAPI, "themes/front")
 	case "WEEKLY":
-		weekly.NewWeekly(theService, theAuth, router.Group("/blog"), theAPI)
+		weekly.NewWeekly(theService, theAuth, router.Group("/blog"), theAPI, "themes/weekly")
 	default:
 		panic("unknown theme")
 	}

front/main.go → themes/front/main.go

@@ -74,6 +74,7 @@ type QueryTags struct {
 
 // Front ...
 type Front struct {
+	base      string // base directory
 	service   *service.Service
 	templates *template.Template
 	router    *gin.RouterGroup
@@ -85,8 +86,9 @@ type Front struct {
 }
 
 // NewFront ...
-func NewFront(service *service.Service, auth *auth.Auth, router *gin.RouterGroup, api *gin.RouterGroup) *Front {
+func NewFront(service *service.Service, auth *auth.Auth, router *gin.RouterGroup, api *gin.RouterGroup, base string) *Front {
 	f := &Front{
+		base:         base,
 		service:      service,
 		router:       router,
 		auth:         auth,
@@ -136,7 +138,7 @@ func (f *Front) loadTemplates() {
 
 	var tmpl *template.Template
 	tmpl = template.New("front").Funcs(funcs)
-	path := filepath.Join("front/templates", "*.html")
+	path := filepath.Join(f.base, "templates", "*.html")
 	tmpl, err := tmpl.ParseGlob(path)
 	if err != nil {
 		panic(err)
@@ -213,7 +215,7 @@ func (f *Front) Query(c *gin.Context, path string) {
 		c.String(http.StatusForbidden, "403 Forbidden")
 		return
 	}
-	c.File(filepath.Join("front/statics", path))
+	c.File(filepath.Join(f.base, "statics", path))
 }
 
 func (f *Front) handle304(c *gin.Context, p *protocols.Post) bool {

front/tools.go → themes/front/tools.go

@@ -9,6 +9,7 @@ import (
 )
 
 func toolpath(name string) string {
+	// TODO use base
 	return filepath.Join("front/tools/bin", name)
 }
 

weekly/main.go → themes/weekly/main.go

@@ -49,6 +49,7 @@ type Home struct {
 
 // Weekly ...
 type Weekly struct {
+	base      string // base directory
 	service   *service.Service
 	templates *template.Template
 	router    *gin.RouterGroup
@@ -60,8 +61,9 @@ type Weekly struct {
 }
 
 // NewWeekly ...
-func NewWeekly(service *service.Service, auth *auth.Auth, router *gin.RouterGroup, api *gin.RouterGroup) *Weekly {
+func NewWeekly(service *service.Service, auth *auth.Auth, router *gin.RouterGroup, api *gin.RouterGroup, base string) *Weekly {
 	w := &Weekly{
+		base:         base,
 		service:      service,
 		router:       router,
 		auth:         auth,
@@ -95,7 +97,7 @@ func (w *Weekly) loadTemplates() {
 
 	var tmpl *template.Template
 	tmpl = template.New("weekly").Funcs(funcs)
-	path := filepath.Join("weekly/templates", "*.html")
+	path := filepath.Join(w.base, "templates", "*.html")
 	tmpl, err := tmpl.ParseGlob(path)
 	if err != nil {
 		panic(err)
@@ -131,7 +133,7 @@ func (w *Weekly) Query(c *gin.Context, path string) {
 		w.queryBySlug(c, slug)
 		return
 	}
-	c.File(filepath.Join("weekly/statics", path))
+	c.File(filepath.Join(w.base, "statics", path))
 }
 
 func (w *Weekly) handle304(c *gin.Context, p *protocols.Post) bool {