peter/wiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extract getPageBase

Browse Source
This commit is contained in:
Peter Stuifzand 2020-05-18 21:49:57 +02:00
parent 1af1ae164c
commit 419571daf6
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
main.go
View File

@ -281,22 +281,33 @@ func (h *historyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
err = t.Execute(w, historyPage{ pageBase := getPageBase()
pageBaseInfo: pageBaseInfo{ pageData := historyPage{
BaseURL: ClientID, pageBaseInfo: pageBase,
RedirectURI: RedirectURI, Session: sess,
}, Title: "History of " + cleanTitle(page),
Session: sess, Name: page,
Title: "History of " + cleanTitle(page), History: history,
Name: page, }
History: history,
}) err = t.Execute(w, pageData)
if err != nil { if err != nil {
http.Error(w, err.Error(), 500) http.Error(w, err.Error(), 500)
return return
} }
} }
func getPageBase() pageBaseInfo {
clientID := ClientID
redirectURI := RedirectURI
pageBase := pageBaseInfo{
BaseURL: clientID,
RedirectURI: redirectURI,
}
return pageBase
}
func (h *saveHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *saveHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
@ -395,11 +406,9 @@ func (h *editHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
`, html.EscapeString(pageText))) `, html.EscapeString(pageText)))
} }
pageBase := getPageBase()
data := editPage{ data := editPage{
pageBaseInfo: pageBaseInfo{ pageBaseInfo: pageBase,
BaseURL: ClientID,
RedirectURI: RedirectURI,
},
Session: sess, Session: sess,
Title: cleanTitle(page), Title: cleanTitle(page),
Content: pageText, Content: pageText,
@ -500,11 +509,9 @@ func (h *indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
) )
pageText = md.RenderToString([]byte(pageText)) pageText = md.RenderToString([]byte(pageText))
pageBase := getPageBase()
data := indexPage{ data := indexPage{
pageBaseInfo: pageBaseInfo{ pageBaseInfo: pageBase,
BaseURL: ClientID,
RedirectURI: RedirectURI,
},
Session: sess, Session: sess,
Title: cleanTitle(page), Title: cleanTitle(page),
Content: template.HTML(pageText), Content: template.HTML(pageText),
@ -574,15 +581,13 @@ func (h *recentHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
pageBase := getPageBase()
err = t.Execute(w, recentPage{ err = t.Execute(w, recentPage{
pageBaseInfo: pageBaseInfo{ pageBaseInfo: pageBase,
BaseURL: ClientID, Session: sess,
RedirectURI: RedirectURI, Title: "Recent changes",
}, Name: "Recent changes",
Session: sess, Recent: changes,
Title: "Recent changes",
Name: "Recent changes",
Recent: changes,
}) })
if err != nil { if err != nil {
http.Error(w, err.Error(), 500) http.Error(w, err.Error(), 500)