archive/nntpchan
Archived
1
0
Fork 0
Code Activity

more

Browse Source
This commit is contained in:
Jeff Becker
2018-03-09 16:24:57 -05:00
parent 58464582bd
commit caf9378073
5 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/backends/nntpchand/files/templates/overchan/error.html.tmpl
View File

@@ -1,11 +0,0 @@
<!doctype html>
<html>
<head>
<title> Error </title>
</head>
<body>
<pre> {{ .Error}} </pre>
</body>
</html>

11
contrib/backends/nntpchand/files/templates/overchan/index.html.tmpl
View File

@@ -1,11 +0,0 @@
<!doctype html>
<html>
<head>
<title> Overchan </title>
</head>
<body>
<pre>ebin</pre>
</body>
</html>

3
contrib/backends/nntpchand/src/nntpchan/lib/config/middleware.go
View File

@@ -6,9 +6,12 @@ type MiddlewareConfig struct {
Type string `json:"type"`
// directory for our html templates
Templates string `json:"templates_dir"`
// directory for static files
StaticDir string `json:"static_dir"`
}
var DefaultMiddlewareConfig = MiddlewareConfig{
Type: "overchan",
Templates: "./files/templates/overchan/",
StaticDir: "./files/",
}

21
contrib/backends/nntpchand/src/nntpchan/lib/frontend/overchan.go
View File

@@ -14,10 +14,11 @@ import (
// standard overchan imageboard middleware
type overchanMiddleware struct {
templ *template.Template
captcha *CaptchaServer
store *sessions.CookieStore
db database.Database
templ *template.Template
captcha *CaptchaServer
store *sessions.CookieStore
db database.Database
staticDir string
}
func (m *overchanMiddleware) SetupRoutes(mux *mux.Router) {
@@ -34,6 +35,8 @@ func (m *overchanMiddleware) SetupRoutes(mux *mux.Router) {
m.captcha = NewCaptchaServer(200, 400, captchaPrefix, m.store)
// setup captcha endpoint
m.captcha.SetupRoutes(mux.PathPrefix(captchaPrefix).Subrouter())
mux.Path("/static/").Handler(http.FileServer(http.Dir(m.staticDir)))
}
// reload middleware
@@ -57,9 +60,9 @@ func (m *overchanMiddleware) ServeBoardPage(w http.ResponseWriter, r *http.Reque
var obj interface{}
obj, err = m.db.BoardPage(board, pageno, 10)
if err == nil {
m.serveTemplate(w, r, "board.html.tmpl", obj)
m.serveTemplate(w, r, "board.html", obj)
} else {
m.serveTemplate(w, r, "error.html.tmpl", err)
m.serveTemplate(w, r, "error.html", err)
}
} else {
// 404
@@ -72,15 +75,15 @@ func (m *overchanMiddleware) ServeThread(w http.ResponseWriter, r *http.Request)
param := mux.Vars(r)
obj, err := m.db.ThreadByHash(param["id"])
if err == nil {
m.serveTemplate(w, r, "thread.html.tmpl", obj)
m.serveTemplate(w, r, "thread.html", obj)
} else {
m.serveTemplate(w, r, "error.html.tmpl", err)
m.serveTemplate(w, r, "error.html", err)
}
}
// serve index page
func (m *overchanMiddleware) ServeIndex(w http.ResponseWriter, r *http.Request) {
m.serveTemplate(w, r, "index.html.tmpl", nil)
m.serveTemplate(w, r, "index.html", nil)
}
// serve a template