cdramey/qurl
1
0
Fork 0
Code Releases Activity

code cleanup

Browse Source
This commit is contained in:
Christopher Ramey
2021-06-27 09:57:16 -08:00
parent 2510448ed7
commit d9e48a7c41
3 changed files with 95 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pages/root.go
View File

@ -2,9 +2,9 @@ package pages
import (
"fmt"
"git.binarythought.com/cdramey/qurl/assets"
"git.binarythought.com/cdramey/qurl/obj"
"git.binarythought.com/cdramey/qurl/storage"
"git.binarythought.com/cdramey/qurl/assets"
"html/template"
"net/http"
)
@ -12,10 +12,10 @@ import (
type RootHandler struct {
Storage storage.Storage
index *StaticContent
css *StaticContent
favi *StaticContent
usage *StaticContent
index *assets.StaticContent
css *assets.StaticContent
favi *assets.StaticContent
usage *assets.StaticContent
submit *template.Template
}
@ -67,40 +67,33 @@ func (ctx *RootHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func (ctx *RootHandler) Init() error {
var err error
// Initialize the static content object for the index page
data, err := assets.ReadFile("index.html")
ctx.index, err = assets.NewStaticContent("index.html", "text/html")
if err != nil {
return err
}
ctx.index = &StaticContent{Type: "text/html", Content: data }
ctx.index.Init()
// Initialize the static content object for the css
data, err = assets.ReadFile("qurl.css")
ctx.css, err = assets.NewStaticContent("qurl.css", "text/css")
if err != nil {
return err
}
ctx.css = &StaticContent{Type: "text/css", Content: data }
ctx.css.Init()
// Initialize the static content object favicon
data, err = assets.ReadFile("favicon.ico")
ctx.favi, err = assets.NewStaticContent("favicon.ico", "image/x-icon")
if err != nil {
return err
}
ctx.favi = &StaticContent{Type: "image/x-icon", Content: data}
ctx.favi.Init()
// Initialize the api usage instructions
data, err = assets.ReadFile("usage.html")
ctx.usage, err = assets.NewStaticContent("usage.html", "text/html")
if err != nil {
return err
}
ctx.usage = &StaticContent{Type: "text/html", Content: data}
ctx.usage.Init()
// Initialize submit page template
data, err = assets.ReadFile("submit.html")
data, err := assets.ReadFile("submit.html")
if err != nil {
return err
}