Remove the public/ directory

Now that all templates are provided by plugins, there's no need to have a public/ directory. Themes can be in /themes instead of /public/themes.
2019-12-16 12:57:30 +01:00 · 2019-12-16 12:57:30 +01:00 · e93346ffa9
commit e93346ffa9
parent d897eeee5c
15 changed files with 18 additions and 7 deletions
--- a/README.md
+++ b/README.md
@ -10,11 +10,11 @@ See `-h` for more information.

 ## Themes

-They should be put in `public/themes/<name>/`.
+They should be put in `themes/<name>/`.

-Templates in `public/themes/<name>/*.html` override default templates in
-`public/*.html`. Assets in `public/themes/<name>/assets/*` are served by the
-HTTP server at `/themes/<name>/assets/*`.
+Templates in `themes/<name>/*.html` override default templates in plugins.
+Assets in `themes/<name>/assets/*` are served by the HTTP server at
+`/themes/<name>/assets/*`.

 ## Plugins

--- a/server.go
+++ b/server.go
@ -196,7 +196,7 @@ func New(e *echo.Echo, options *Options) error {
 		}
 	})

-	e.Static("/themes", "public/themes")
+	e.Static("/themes", "themes")

 	for _, p := range s.Plugins {
 		p.SetRoutes(e.Group(""))
--- a/template.go
+++ b/template.go
@ -10,7 +10,7 @@ import (
 	"github.com/labstack/echo/v4"
 )

-const themesDir = "public/themes"
+const themesDir = "themes"

 // GlobalRenderData contains data available in all templates.
 type GlobalRenderData struct {
@ -76,7 +76,7 @@ func loadTheme(name string, base *template.Template) (*template.Template, error)
 		return nil, err
 	}

-	theme, err = theme.ParseGlob("public/themes/" + name + "/*.html")
+	theme, err = theme.ParseGlob(themesDir + "/" + name + "/*.html")
 	if err != nil {
 		return nil, err
 	}
--- a/public/themes/sourcehut/Makefile
+++ b/public/themes/sourcehut/Makefile
--- a/public/themes/sourcehut/assets/style.css
+++ b/public/themes/sourcehut/assets/style.css
--- a/public/themes/sourcehut/caret-left.html
+++ b/public/themes/sourcehut/caret-left.html
--- a/public/themes/sourcehut/compose.html
+++ b/public/themes/sourcehut/compose.html
--- a/public/themes/sourcehut/head.html
+++ b/public/themes/sourcehut/head.html
--- a/public/themes/sourcehut/login.html
+++ b/public/themes/sourcehut/login.html
--- a/public/themes/sourcehut/mailbox.html
+++ b/public/themes/sourcehut/mailbox.html
--- a/public/themes/sourcehut/message.html
+++ b/public/themes/sourcehut/message.html
--- a/public/themes/sourcehut/nav.html
+++ b/public/themes/sourcehut/nav.html
--- a/public/themes/sourcehut/scss/main.scss
+++ b/public/themes/sourcehut/scss/main.scss
--- a/themes/test/assets/style.css
+++ b/themes/test/assets/style.css
@ -0,0 +1,3 @@
+body {
+	background-color: pink;
+}
--- a/themes/test/head.html
+++ b/themes/test/head.html
@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>koushin</title>
+    <link rel="stylesheet" href="/assets/style.css">
+  </head>
+  <body>