From eb86fbf4c88647bcc6aaa86660da58df96a72850 Mon Sep 17 00:00:00 2001 From: xengineering Date: Mon, 27 Mar 2023 18:08:34 +0200 Subject: Switch to simple.css This very simple CSS framework is far better / beautiful / easy to maintain than my own CSS. --- .gitmodules | 6 +++--- Makefile | 2 +- appdata/index.html.tmpl | 54 ++++++++++++++++++++++++++----------------------- appdata/simple.css | 1 + appdata/webiot.css | 1 - libweb | 1 - main.go | 4 ++-- simple.css | 1 + 8 files changed, 37 insertions(+), 33 deletions(-) create mode 120000 appdata/simple.css delete mode 120000 appdata/webiot.css delete mode 160000 libweb create mode 160000 simple.css diff --git a/.gitmodules b/.gitmodules index 774fbe7..a3875af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "libweb"] - path = libweb - url = https://cgit.xengineering.eu/libweb/ +[submodule "simple.css"] + path = simple.css + url = https://github.com/kevquirk/simple.css.git diff --git a/Makefile b/Makefile index c8d409a..2c6bde8 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ install: all install -Dm 755 build/$(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) install -Dm 644 config.json $(DESTDIR)/etc/$(PROGRAM)/config.json install -Dm 644 appdata/index.html.tmpl $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/index.html.tmpl - install -Dm 644 appdata/webiot.css $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/webiot.css + install -Dm 644 appdata/simple.css $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/simple.css install -Dm 644 systemd/$(PROGRAM).service $(DESTDIR)$(PREFIX)/lib/systemd/system/$(PROGRAM).service install -Dm 644 systemd/$(PROGRAM).sysusers $(DESTDIR)$(PREFIX)/lib/sysusers.d/$(PROGRAM).conf diff --git a/appdata/index.html.tmpl b/appdata/index.html.tmpl index 17c67c1..131d4c1 100644 --- a/appdata/index.html.tmpl +++ b/appdata/index.html.tmpl @@ -1,9 +1,5 @@ - - @@ -12,35 +8,43 @@ - + -
- -

IoT

+
+

webiot

+

A simple IoT web server

+
- {{range .Hs100}} -
-

{{.Name}}

+
{{range .Hs100}} +
+

{{.Name}}

-
- {{end}} - - + {{end}} + + + +
diff --git a/appdata/simple.css b/appdata/simple.css new file mode 120000 index 0000000..8f905d1 --- /dev/null +++ b/appdata/simple.css @@ -0,0 +1 @@ +../simple.css/simple.css \ No newline at end of file diff --git a/appdata/webiot.css b/appdata/webiot.css deleted file mode 120000 index 9dd798c..0000000 --- a/appdata/webiot.css +++ /dev/null @@ -1 +0,0 @@ -../libweb/libweb.css \ No newline at end of file diff --git a/libweb b/libweb deleted file mode 160000 index d1e432e..0000000 --- a/libweb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d1e432e4bd53d5214fc2ac1fbb01393bf9c425f5 diff --git a/main.go b/main.go index 3264134..e853616 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,7 @@ func main() { c := parseConfig(configPath) http.HandleFunc("/", index(c.Devices, appdata)) http.HandleFunc("/api", api()) - http.HandleFunc("/webiot.css", css(appdata)) + http.HandleFunc("/simple.css", css(appdata)) fmt.Printf("Serving at http://%s\n", c.Web.Listen) log.Fatal(http.ListenAndServe(c.Web.Listen.String(), nil)) } @@ -90,7 +90,7 @@ func index(devices DevicesConfig, appdata string) func(http.ResponseWriter, *htt func css(appdata string) func(http.ResponseWriter, *http.Request) { // read CSS file - path := filepath.Join(appdata, "webiot.css") + path := filepath.Join(appdata, "simple.css") css := string(mustRead(path)) return func(w http.ResponseWriter, r *http.Request) { diff --git a/simple.css b/simple.css new file mode 160000 index 0000000..b8f82ae --- /dev/null +++ b/simple.css @@ -0,0 +1 @@ +Subproject commit b8f82ae51e294cb9540147f7fe212dedd1f3cb2d -- cgit v1.2.3-70-g09d2