diff --git a/dev.sh b/dev.sh
index 41835b9..9fe65cb 100755
--- a/dev.sh
+++ b/dev.sh
@@ -6,5 +6,6 @@
export MB_LOGLEVEL=debug
export MB_ALLOWED_ORIGINS=*
export MB_HOST=localhost:8080
+export MB_HOT_RELOAD=true
go run main.go
diff --git a/main.go b/main.go
index 3aaf2a6..12c5256 100644
--- a/main.go
+++ b/main.go
@@ -1,11 +1,13 @@
package main
import (
+ "bytes"
"github.com/NYTimes/gziphandler"
"github.com/caddyserver/certmagic"
"github.com/emvi/logbuch"
"github.com/gorilla/mux"
"github.com/rs/cors"
+ "html/template"
"net/http"
"os"
"strings"
@@ -13,11 +15,18 @@ import (
const (
staticDir = "static"
- staticDirPrefix = "/"
+ staticDirPrefix = "/static/"
+ templateDir = "template/*"
logTimeFormat = "2006-01-02_15:04:05"
envPrefix = "MB_"
)
+var (
+ tpl *template.Template
+ tplCache = make(map[string][]byte)
+ hotReload bool
+)
+
func configureLog() {
logbuch.SetFormatter(logbuch.NewFieldFormatter(logTimeFormat, "\t\t"))
logbuch.Info("Configure logging...")
@@ -41,9 +50,52 @@ func logEnvConfig() {
}
}
+func loadTemplate() {
+ logbuch.Debug("Loading templates")
+ var err error
+ tpl, err = template.ParseGlob(templateDir)
+
+ if err != nil {
+ logbuch.Fatal("Error loading template", logbuch.Fields{"err": err})
+ }
+
+ hotReload = os.Getenv("MB_HOT_RELOAD") == "true"
+ logbuch.Debug("Templates loaded", logbuch.Fields{"hot_reload": hotReload})
+}
+
+func renderTemplate(name string) {
+ logbuch.Debug("Rendering template", logbuch.Fields{"name": name})
+ var buffer bytes.Buffer
+
+ if err := tpl.ExecuteTemplate(&buffer, name, nil); err != nil {
+ logbuch.Fatal("Error executing template", logbuch.Fields{"err": err, "name": name})
+ }
+
+ tplCache[name] = buffer.Bytes()
+}
+
+func serveTemplate(name string) http.HandlerFunc {
+ // render once so we have it in cache
+ renderTemplate(name)
+
+ return func(w http.ResponseWriter, r *http.Request) {
+ if hotReload {
+ loadTemplate()
+ renderTemplate(name)
+ }
+
+ if _, err := w.Write(tplCache[name]); err != nil {
+ logbuch.Error("Error returning page to client", logbuch.Fields{"err": err, "name": name})
+ }
+ }
+}
+
func setupRouter() *mux.Router {
router := mux.NewRouter()
router.PathPrefix(staticDirPrefix).Handler(http.StripPrefix(staticDirPrefix, gziphandler.GzipHandler(http.FileServer(http.Dir(staticDir)))))
+ router.Handle("/blog", serveTemplate("blog.html"))
+ router.Handle("/", serveTemplate("about.html"))
+ router.NotFoundHandler = serveTemplate("notfound.html")
return router
}
@@ -83,6 +135,7 @@ func start(handler http.Handler) {
func main() {
configureLog()
logEnvConfig()
+ loadTemplate()
router := setupRouter()
corsConfig := configureCors(router)
start(corsConfig)
diff --git a/static/index.html b/static/index.html
deleted file mode 100644
index 9561259..0000000
--- a/static/index.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
- marvin blum
-
-
-
marvin blum
- welcome to my website!
-
-
-
- who am I?
-
- I'm a full stack software engineer from Germany, open source and Linux enthusiast and co-founder of Emvi .
- In love with Go, but fluent in a lot of programming languages.
-
-
-
- projects
-
-
- Emvi a note taking, collaboration and knowledge management tool for personal use and teams of any size
-
-
- logbuch a simple Golang logging library
-
-
- null a Golang library for nullable types supporting databases and json
-
-
- hide a Golang library to obscure IDs on the API layer
-
-
- accweb a web interface to manage game servers
-
-
-
-
- skills
-
- Go (Golang)
- JavaScript (Vue, Node)
- HTML, CSS, Sass and all the web fuzz
- Java
- PHP
- Linux
- Docker
- Kubernetes
- ... and more
-
-
-
- work
-
-
- arvato as a Java developer
-
-
- skalar marketing as a full stack developer and web designer
-
-
- Emvi co-founder of a note taking, collaboration and knowledge management SaaS startup
-
-
- some freelancing from time to time
-
-
-
-
-
- Like to see more? Read my blog articles on Emvi , my project page on GitHub or send me a mail .
-
-
- This page uses concrete for styling. Check it out!
-
-
-
-
diff --git a/template/about.html b/template/about.html
new file mode 100644
index 0000000..15d0c6b
--- /dev/null
+++ b/template/about.html
@@ -0,0 +1,81 @@
+{{template "head.html"}}
+
+
+
+
marvin blum
+ welcome to my website!
+
+
+
+ who am I?
+
+ I'm a full stack software engineer from Germany, open source and Linux enthusiast and co-founder of Emvi .
+ In love with Go, but fluent in a lot of programming languages.
+
+
+
+ latest blog posts
+
+ TODO
+
+
+ View all
+
+
+
+ projects
+
+
+ Emvi a note taking, collaboration and knowledge management tool for personal use and teams of any size
+
+
+ logbuch a simple Golang logging library
+
+
+ null a Golang library for nullable types supporting databases and json
+
+
+ hide a Golang library to obscure IDs on the API layer
+
+
+ accweb a web interface to manage game servers
+
+
+
+
+ skills
+
+ Go (Golang)
+ JavaScript (Vue, Node)
+ HTML, CSS, Sass and all the web fuzz
+ Java
+ PHP
+ Linux
+ Docker
+ Kubernetes
+ ... and more
+
+
+
+ work
+
+
+ Emvi co-founder of a note taking, collaboration and knowledge management SaaS startup
+
+
+ skalar marketing as a full stack developer and web designer
+
+
+ arvato as a Java developer
+
+
+ some freelancing from time to time
+
+
+
+
+{{template "end.html"}}
diff --git a/template/blog.html b/template/blog.html
new file mode 100644
index 0000000..d16ce71
--- /dev/null
+++ b/template/blog.html
@@ -0,0 +1,8 @@
+{{template "head.html"}}
+{{template "menu.html"}}
+
+
+
+{{template "end.html"}}
diff --git a/template/end.html b/template/end.html
new file mode 100644
index 0000000..a283083
--- /dev/null
+++ b/template/end.html
@@ -0,0 +1,11 @@
+
+
+ Like to see more? Read my blog articles on Emvi , my project page on GitHub or send me a mail .
+
+
+ This page uses concrete for styling. Check it out!
+
+
+
+
- 
+