diff --git a/Todo.txt b/Todo.txt index b53fc15..adc1aed 100644 --- a/Todo.txt +++ b/Todo.txt @@ -16,4 +16,8 @@ - parallax scrolling on background. -- background may include, -- items are free falling --- computers(macentosch), black board, calculators. fun numbers(rainbow), books. coffe mugs \ No newline at end of file +-- computers(macentosch), black board, calculators. fun numbers(rainbow), books. coffe mugs + +- better portifolio intergration with link to repo. + +- company history. \ No newline at end of file diff --git a/main.go b/main.go index 8255e0a..6404519 100644 --- a/main.go +++ b/main.go @@ -75,12 +75,42 @@ func main() { mux.HandleFunc("GET /42", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "./static/42.html") }) mux.HandleFunc("GET /secret", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "./static/secret.html") }) mux.HandleFunc("GET /favicon.ico", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "./static/icon.png") }) - mux.HandleFunc("GET /login", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "./static/login.html") }) + mux.HandleFunc("GET /login", func(w http.ResponseWriter, r *http.Request) { + + cookie, err := r.Cookie("session") + if err == nil { + sessionMu.RLock() + expiry, ok := sessionStore[cookie.Value] + sessionMu.RUnlock() + // had session, but invalid + if !ok || time.Now().After(expiry) { + sessionMu.Lock() + delete(sessionStore, cookie.Value) + sessionMu.Unlock() + } else { // valid session + http.Redirect(w, r, "/admin", http.StatusSeeOther) + } + } + + http.ServeFile(w, r, "./static/login.html") + }) mux.HandleFunc("GET /admin", requireAuth(func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "./static/admin.html") })) + mux.HandleFunc("GET /logout", requireAuth(func(w http.ResponseWriter, r *http.Request) { + cookie, err := r.Cookie("session") + if err == nil { + // delete session cookie token + sessionMu.Lock() + delete(sessionStore, cookie.Value) + sessionMu.Unlock() + } + + http.Redirect(w, r, "/", http.StatusSeeOther) + })) + mux.HandleFunc("POST /newsletter/subscribe", func(w http.ResponseWriter, r *http.Request) { var req struct { Email string `json:"email"` @@ -149,7 +179,7 @@ func main() { HttpOnly: true, Secure: true, SameSite: http.SameSiteLaxMode, - Expires: time.Now().Add(12 * time.Hour), + Expires: time.Now().Add(48 * time.Hour), }) // htmx reads this header and does the redirect client-side diff --git a/site b/site index c81fea9..b5061d0 100755 Binary files a/site and b/site differ diff --git a/static/index.html b/static/index.html index 2b5c8b2..b38b7f3 100644 --- a/static/index.html +++ b/static/index.html @@ -18,7 +18,7 @@ @@ -447,24 +447,12 @@
© 2026 — all rights reserved
- + + + - + + + + Samantha Vero Friis + + + + + + + + + +
@@ -76,3 +71,27 @@
+ + + + + \ No newline at end of file