diff --git a/.gitmodules b/.gitmodules index fef61cf..b960ade 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "static"] path = static url = https://github.com/cactorium/cactorium.github.io +[submodule "resume"] + path = resume + url = https://github.com/cactorium/kelvin-ly-resume.git diff --git a/main.css b/main.css index d36db28..38126bf 100644 --- a/main.css +++ b/main.css @@ -1,5 +1,68 @@ body { + margin: 0; + background-color: rgb(240, 240, 240); +} + +article { max-width: 1012px; margin-right: auto; margin-left: auto; } + +nav, footer { + background-color: rgb(1, 33, 1); + margin-right: auto; + margin-left: auto; + size: 1.5em; + color: rgb(180, 220, 180); +} + +a { + text-decoration: none; + color: rgb(220, 220, 250); +} + + +.footer-wrapper, .nav-wrapper { + max-width: 1012px; + margin-right: auto; + margin-left: auto; +} + +.nav-wrapper { + display: flex; + flex-direction: row; + justify-content: flex; +} + +.nav-item { + padding-top: 1.2em; + padding-bottom: 1.2em; + transition: 0.3s; +} + +.nav-item a { + padding-left: 1.2em; + padding-right: 1.2em; + font-size: 1.2em; + transition: 0.3s; +} + +.nav-item:hover { + background-color: rgb(180, 220, 200); + transition: 0.3s; +} + +.nav-item:hover a { + transition: 0.3s; + color: rgb(5, 35, 35); +} + +.footer-wrapper { + text-align: right; + padding-top: 1.0em; + padding-bottom: 1em; + padding-left: 1.0em; + padding-right: 1.0em; + bottom: 0; +} diff --git a/main.go b/main.go index 82495ac..f1ebbb1 100644 --- a/main.go +++ b/main.go @@ -36,12 +36,24 @@ const HTML_HEADER = ` +
` const HTML_FOOTER = `
` @@ -105,7 +117,8 @@ func main() { LogFileName: "/tmp/kelvinly-server-log", LogFilePerm: 0640, WorkDir: "/home/kelvin/kelvinly-server/", - Umask: 027, + //WorkDir: ".", + Umask: 027, } // TODO: figure out the daemonizing stuff @@ -169,6 +182,7 @@ func startServer(srv *http.Server) { serveMux.HandleFunc("/", rootHandler) //serveMux.Handle("/certbot/", http.StripPrefix("/certbot/", http.FileServer(http.Dir("./certbot-tmp")))) serveMux.Handle("/gfm/", http.StripPrefix("/gfm", http.FileServer(gfmstyle.Assets))) + serveMux.Handle("/resume/", http.StripPrefix("/resume", http.FileServer(http.Dir("resume/")))) serveMux.HandleFunc("/main.css", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "main.css") }) srv.Addr = ":8443" @@ -176,6 +190,9 @@ func startServer(srv *http.Server) { log.Print("starting server") log.Fatal(srv.ListenAndServeTLS("/etc/letsencrypt/live/"+DOMAIN_NAME+"/fullchain.pem", "/etc/letsencrypt/live/"+DOMAIN_NAME+"/privkey.pem")) + /* + log.Fatal(srv.ListenAndServe()) + */ close(serverShutdown) } diff --git a/resume b/resume new file mode 160000 index 0000000..ebda2c3 --- /dev/null +++ b/resume @@ -0,0 +1 @@ +Subproject commit ebda2c3802c3f94820a711bd5348125df4570430