From fefe7774c5b75f8a1c8923a7c394e6f025223e5e Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sun, 17 Apr 2022 15:42:22 -0230 Subject: server, navbar, style --- Makefile | 14 ++++++ go.mod | 3 ++ htdocs/base.html | 29 +++++++++++++ htdocs/index.html | 3 ++ htdocs/software/index.html | 7 +++ htdocs/style.css | 29 +++++++++++++ index.html | 6 --- server.go | 106 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 Makefile create mode 100644 go.mod create mode 100644 htdocs/base.html create mode 100644 htdocs/index.html create mode 100644 htdocs/software/index.html create mode 100644 htdocs/style.css delete mode 100644 index.html create mode 100644 server.go diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5add856 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +build: tidy format + go build + +serve: tidy format + go run . + +live: + rsync -rtvzP ./htdocs/ sam@samanthony.xyz:/var/www/htdocs/samanthony.xyz/ + +format: + gofmt -s -w . + +tidy: + go mod tidy diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..ace7593 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module git.samanthony.xyz/samanthony.xyz + +go 1.18 diff --git a/htdocs/base.html b/htdocs/base.html new file mode 100644 index 0000000..5c02174 --- /dev/null +++ b/htdocs/base.html @@ -0,0 +1,29 @@ + + + + + + + {{ define "title" }}samanthony.xyz{{ end }} + {{ template "title" }} + + + {{ define "style" }}{{ end }} + {{ template "style" }} + + + + + {{ template "body_content" }} + + diff --git a/htdocs/index.html b/htdocs/index.html new file mode 100644 index 0000000..ac2f7a6 --- /dev/null +++ b/htdocs/index.html @@ -0,0 +1,3 @@ +{{ define "body_content" }} +

Hello, world!

+{{ end }} diff --git a/htdocs/software/index.html b/htdocs/software/index.html new file mode 100644 index 0000000..4b1092d --- /dev/null +++ b/htdocs/software/index.html @@ -0,0 +1,7 @@ +{{ define "title" }} + software | samanthony.xyz +{{ end }} + +{{ define "body_content" }} +

This is the software page

+{{ end }} diff --git a/htdocs/style.css b/htdocs/style.css new file mode 100644 index 0000000..ae0ac35 --- /dev/null +++ b/htdocs/style.css @@ -0,0 +1,29 @@ +body { + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + + background-color: black; + color: white; + + font-family: sans-serif; +} + +/* Navbar */ +nav { + background-color: #4acaa4; + font-size: 1.6em; +} +nav a { + font-size: 0.7em; + color: white; + text-decoration: none; +} +nav p:first-child + a { font-weight: bold; } +nav a.this-section { font-style: italic; } +nav p { display: inline; } +nav p:first-child { margin-left: 0.1em; } +nav hr { + margin: 0px; + color: white; +} diff --git a/index.html b/index.html deleted file mode 100644 index 39a00d6..0000000 --- a/index.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -

Hello, world!

- - diff --git a/server.go b/server.go new file mode 100644 index 0000000..d40c86c --- /dev/null +++ b/server.go @@ -0,0 +1,106 @@ +package main + +import ( + "fmt" + tmpl "html/template" + "io/fs" + "log" + "net/http" + "os" + "path" + fp "path/filepath" + "strings" +) + +const ( + host = "" + port = "6969" + root = "htdocs/" +) + +var tmpls = make(map[string]*tmpl.Template) + +func init() { + err := fp.WalkDir(root, func(path string, d fs.DirEntry, err error) error { + if fp.Clean(path) == fp.Clean(root) || + fp.Ext(path) != ".html" || + path == fp.Join(root, "base.html") { + return nil + } + label := path[len(fp.Clean(root)):] + tmpls[label] = tmpl.Must(tmpl.ParseFiles(fp.Join(root, "base.html"), path)) + return nil + }) + if err != nil { + log.Fatal(err) + } +} + +type Page struct { + Nav Nav +} + +type Nav struct { + ThisSection string + Links []NavLink +} + +type NavLink struct { + Href string + Label string +} + +var nav = Nav{ + Links: []NavLink{ + {"/", "samanthony.xyz"}, + {"/software/", "software"}, + }, +} + +func rootHandler(w http.ResponseWriter, r *http.Request) { + reqPath := r.URL.Path + + // If request directory, serve index.html. + // ie. /software -> /software/index.html + if info, err := os.Stat(fp.Join(root, reqPath)); err == nil { + if info.IsDir() { + reqPath = path.Join(reqPath, "index.html") + } + } else if os.IsNotExist(err) { + http.NotFound(w, r) + return + } else { + fmt.Println(err) + code := http.StatusInternalServerError + http.Error(w, http.StatusText(code), code) + return + } + + if t, ok := tmpls[reqPath]; ok { + thisSection := "" + for _, link := range nav.Links { + if strings.HasPrefix(reqPath, link.Href) { + thisSection = link.Href + } + } + nav := nav + nav.ThisSection = thisSection + page := Page{nav} + + err := t.Execute(w, page) + if err != nil { + fmt.Println(err) + code := http.StatusInternalServerError + http.Error(w, http.StatusText(code), code) + return + } + } else { + http.ServeFile(w, r, fp.Join(root, reqPath)) + } +} + +func main() { + http.HandleFunc("/", rootHandler) + fmt.Printf("Listening on %s:%s\n", host, port) + log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%s", host, port), nil)) +} -- cgit v1.2.3