Merge pull request #4 from jwoytek/feature/3-light-dark-switch

Feature/3 light dark switch (fixes #2 and #3 )
jwoytek · May 16, 2023 · d19636a · d19636a
2 parents 1c94bb3 + 9d44261
commit d19636a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# ignore site config
+showtimer.yaml
+
 # If you prefer the allow list template instead of the deny list, see community template:
 # https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
 #

diff --git a/README.md b/README.md
@@ -21,7 +21,8 @@ Currently, most setup and startup of the program must be done from the
 command line (Windows CMD.EXE, MacOS Terminal, etc.). 
 
 1. unzip the bundle in a useful location, like your home directory
-2. Edit the `showtimer.yaml` file with your favorite editor
+2. Copy `showtimer_example.yaml` to a name of your choice. The default
+   is `showtimer.yaml`. Edit the file with your favorite editor.
 3. Set the port values for the webserver and OSC (or note the defaults)
 4. Optionally, if you would like to only listen on a certain interface,
    enter the IP address of that interface. This is probably not common.

diff --git a/main.go b/main.go
@@ -38,9 +38,10 @@ type timerConfig struct {
 }
 
 type config struct {
-	Osc    map[string]string
-	Web    map[string]string
-	Timers []timerConfig
+	Osc      map[string]string
+	Web      map[string]string
+	Darkmode bool
+	Timers   []timerConfig
 }
 
 func main() {
@@ -123,7 +124,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Unable to parse port for web server from '%s': %s", Config.Web["port"], err)
 	}
-	runWebServer(Config.Web["bind"], webPort, ctx)
+	runWebServer(Config.Web["bind"], webPort, Config.Darkmode, ctx)
 
 	oscPort, err := strconv.Atoi(Config.Osc["port"])
 	if err != nil {

diff --git a/showtimer.yaml → showtimer_example.yaml b/showtimer.yaml → showtimer_example.yaml
@@ -4,6 +4,7 @@ web:
 osc:
   #bind: 0.0.0.0
   port: 8000
+darkmode: false
 timers:
   - name: Act 1
     key: act1

diff --git a/timers.html → templates/base.html b/timers.html → templates/base.html
@@ -1,5 +1,7 @@
 <!doctype html>
-<html lang="en" data-bs-theme="dark">
+{{block "theme" .}}
+<html lang="en" data-bs-theme="light">
+{{end}}
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/templates/darkmode.html b/templates/darkmode.html
@@ -0,0 +1,3 @@
+{{define "theme"}}
+<html lang="en" data-bs-theme="dark">
+{{end}}
diff --git a/webserver.go b/webserver.go
@@ -7,6 +7,7 @@ import (
 	"html/template"
 	"log"
 	"net/http"
+	"path/filepath"
 	"strings"
 )
 
@@ -19,7 +20,10 @@ type timerValue struct {
 	Running      bool   `json:"running"`
 }
 
-func runWebServer(bindAddr string, bindPort int, ctx context.Context) {
+var dm bool
+
+func runWebServer(bindAddr string, bindPort int, darkmode bool, ctx context.Context) {
+	dm = darkmode
 	staticServer := http.FileServer(http.Dir("./static"))
 	http.Handle("/static/", http.StripPrefix("/static/", staticServer))
 	http.HandleFunc("/timer/", timerValueHandler)
@@ -43,7 +47,11 @@ func runWebServer(bindAddr string, bindPort int, ctx context.Context) {
 }
 
 func webHandler(w http.ResponseWriter, r *http.Request) {
-	t, err := template.ParseFiles("timers.html")
+	files := []string{filepath.Join("templates", "base.html")}
+	if dm {
+		files = append(files, filepath.Join("templates", "darkmode.html"))
+	}
+	t, err := template.ParseFiles(files...)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return