ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

added initial favicon

Browse source
This commit is contained in:
ston1th 2019-01-23 00:37:51 +01:00
commit 6a2dc8146c
7 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/server/handler.go
View file

@ -73,6 +73,9 @@ func staticHandler(ctx *Context) {
err = ctx.Write(ctx.Srv.res["bootstrap.css"]) err = ctx.Write(ctx.Srv.res["bootstrap.css"])
case "/custom.css": case "/custom.css":
err = ctx.Write(ctx.Srv.res["custom.css"]) err = ctx.Write(ctx.Srv.res["custom.css"])
case "/favicon.ico":
ctx.SetHeader("Content-Type", "image/x-icon")
err = ctx.Write(ctx.Srv.res["favicon.ico"])
} }
if err != nil { if err != nil {
log.Println("static:", err) log.Println("static:", err)

5
pkg/server/routes.go
View file

@ -14,6 +14,11 @@ var routes = []route{
indexHandler, indexHandler,
[]string{"GET"}, []string{"GET"},
}, },
{
"/favicon.ico",
staticHandler,
[]string{"GET"},
},
{ {
"/bootstrap.css", "/bootstrap.css",
staticHandler, staticHandler,

15
pkg/server/templates.go
View file

File diff suppressed because one or more lines are too long

7
sri.sh
View file

@ -3,7 +3,8 @@
HASH="sha256" HASH="sha256"
DIR="templates" DIR="templates"
FILES="*.css *.js *.ico" FILES="*.css *.js"
BINS="*.ico"
echo "SRI (subresource integrity) hashes" echo "SRI (subresource integrity) hashes"
cd ${DIR} cd ${DIR}
for f in $(ls ${FILES} 2>/dev/null); do for f in $(ls ${FILES} 2>/dev/null); do
@ -12,3 +13,7 @@ for f in $(ls ${FILES} 2>/dev/null); do
printf "%13s: " ${f} printf "%13s: " ${f}
echo "${HASH}-$(cat ${f}|openssl dgst -${HASH} -binary|openssl enc -base64 -A)" echo "${HASH}-$(cat ${f}|openssl dgst -${HASH} -binary|openssl enc -base64 -A)"
done done
for f in $(ls ${BINS} 2>/dev/null); do
printf "%13s: " ${f}
echo "${HASH}-$(cat ${f}|openssl dgst -${HASH} -binary|openssl enc -base64 -A)"
done

15
templates.sh
View file

@ -22,6 +22,7 @@ cat << EOF > ${templates_go}
package server package server
import ( import (
"encoding/base64"
"errors" "errors"
"git.giftfish.de/ston1th/gowiki/pkg/log" "git.giftfish.de/ston1th/gowiki/pkg/log"
"html/template" "html/template"
@ -43,11 +44,13 @@ for f in $(ls templates/*.css); do
echo " ${fname} = \`$(cat ${f})\`" >> ${templates_go} echo " ${fname} = \`$(cat ${f})\`" >> ${templates_go}
done done
echo " favicon = \"$(base64 -w 0 templates/favicon.ico)\"" >> ${templates_go}
cat << EOF >> ${templates_go} cat << EOF >> ${templates_go}
) )
func (s *HTTPServer) loadTemplates() { func (s *HTTPServer) loadTemplates() {
var errf bool var fatal bool
s.templ = make(map[string]*template.Template) s.templ = make(map[string]*template.Template)
s.res = make(map[string][]byte) s.res = make(map[string][]byte)
parse := func(html ...string) (temp *template.Template) { parse := func(html ...string) (temp *template.Template) {
@ -57,7 +60,7 @@ func (s *HTTPServer) loadTemplates() {
temp, err = temp.Parse(s) temp, err = temp.Parse(s)
if err != nil { if err != nil {
log.Println("parse:", err) log.Println("parse:", err)
errf = true fatal = true
return return
} }
} }
@ -67,6 +70,12 @@ func (s *HTTPServer) loadTemplates() {
// resources // resources
s.res["bootstrap.css"] = []byte(bootstrapCSS) s.res["bootstrap.css"] = []byte(bootstrapCSS)
s.res["custom.css"] = []byte(customCSS) s.res["custom.css"] = []byte(customCSS)
fav, err := base64.StdEncoding.DecodeString(favicon)
if err != nil {
log.Println("favicon:", err)
fatal = true
}
s.res["favicon.ico"] = fav
// pages // pages
s.templ["notFoundHandler"] = parse(index, menu, notFound) s.templ["notFoundHandler"] = parse(index, menu, notFound)
@ -92,7 +101,7 @@ func (s *HTTPServer) loadTemplates() {
// totp // totp
s.templ["userTotpHandler"] = parse(index, menu, userTotp) s.templ["userTotpHandler"] = parse(index, menu, userTotp)
if errf { if fatal {
log.Fatal("parse: ", errors.New("parsing templates failed")) log.Fatal("parse: ", errors.New("parsing templates failed"))
} }
} }

BIN
templates/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

1
templates/index.html
View file

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>GoWiki | {{.Title}}</title> <title>GoWiki | {{.Title}}</title>
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" integrity="sha256-bgotk/IPq4Yvt6s8AQGPTM5ZjPjQ6rrBRa2EyxpnFSc="></link>
<link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-NeLmQ7cX66J4MdtgGlG3O/TgvsSyP1b9WbaQtxYZUbQ="></link> <link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-NeLmQ7cX66J4MdtgGlG3O/TgvsSyP1b9WbaQtxYZUbQ="></link>
<link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-o0xveJH8qNnWr/39Jnx97yDlYrvjuUnzE4q3p+94Yp4="></link> <link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-o0xveJH8qNnWr/39Jnx97yDlYrvjuUnzE4q3p+94Yp4="></link>
<meta name="theme-color" content="#375a7f"> <meta name="theme-color" content="#375a7f">