From ba04121e599f59801cd888f751f4e82c8acb7c24 Mon Sep 17 00:00:00 2001 From: Thomas Klaehn Date: Thu, 2 Oct 2025 13:45:39 +0200 Subject: [PATCH] Remove bicycle api Signed-off-by: Thomas Klaehn --- Makefile | 2 +- go.mod | 10 +--------- go.sum | 24 ------------------------ homeservice.service | 2 +- main.go | 4 ++-- webui/src/lib/Header.svelte | 1 - 6 files changed, 5 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index f7fad84..7beb937 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ install: all # Web ui install -d $(WEB_DIR) - cp -r webui/build/* $(WEB_DIR) + cp -r build/webui/* $(WEB_DIR) .PHONY: uninstall uninstall: diff --git a/go.mod b/go.mod index f1e3a25..d46e268 100644 --- a/go.mod +++ b/go.mod @@ -2,19 +2,11 @@ module webserver go 1.20 -require ( - git.blackfinn.de/apiservice/bicycle v0.0.2 - git.blackfinn.de/apiservice/sauna v1.1.0 -) +require git.blackfinn.de/apiservice/sauna v1.1.0 require ( - github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.1 // indirect - github.com/influxdata/influxdb-client-go/v2 v2.13.0 // indirect - github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect - github.com/oapi-codegen/runtime v1.0.0 // indirect golang.org/x/net v0.22.0 // indirect golang.org/x/sync v0.6.0 // indirect ) diff --git a/go.sum b/go.sum index d4df380..dd25e19 100644 --- a/go.sum +++ b/go.sum @@ -1,34 +1,10 @@ -git.blackfinn.de/apiservice/bicycle v0.0.2 h1:q+DMnWzxa4ZWxwMf03OPhQyDGRii7l7YmrEKYLgwn2A= -git.blackfinn.de/apiservice/bicycle v0.0.2/go.mod h1:ygL9Ax8JreS+taIsqNq0NNlmhGnrHE+v1NE8Solihls= git.blackfinn.de/apiservice/sauna v1.1.0 h1:F2qysKjOld5lwTT7VJCY1YIEz6rXtE8CLpEfkGmeM3o= git.blackfinn.de/apiservice/sauna v1.1.0/go.mod h1:yM5lSlCApQrrZ7a+Y8ZxzBkLV2Frx6k1cw219XeSEG4= -github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= -github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= -github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= -github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/eclipse/paho.mqtt.golang v1.4.3 h1:2kwcUGn8seMUfWndX0hGbvH8r7crgcJguQNCyp70xik= github.com/eclipse/paho.mqtt.golang v1.4.3/go.mod h1:CSYvoAlsMkhYOXh/oKyxa8EcBci6dVkLCbo5tTC1RIE= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/influxdata/influxdb-client-go/v2 v2.13.0 h1:ioBbLmR5NMbAjP4UVA5r9b5xGjpABD7j65pI8kFphDM= -github.com/influxdata/influxdb-client-go/v2 v2.13.0/go.mod h1:k+spCbt9hcvqvUiz0sr5D8LolXHqAAOfPw9v/RIRHl4= -github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf h1:7JTmneyiNEwVBOHSjoMxiWAqB992atOeepeFYegn5RU= -github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= -github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo= -github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/homeservice.service b/homeservice.service index 3604d94..bc22bd5 100644 --- a/homeservice.service +++ b/homeservice.service @@ -4,7 +4,7 @@ After=multi-user.target [Service] Type=idle -ExecStart=/usr/bin/homeservice -d /var/lib/home/ +ExecStart=/usr/bin/homeservice -d /var/lib/homeservice/ [Install] WantedBy=multi-user.target diff --git a/main.go b/main.go index 54bf615..5abd8d3 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "log" "net/http" - bicycle "git.blackfinn.de/apiservice/bicycle" + // bicycle "git.blackfinn.de/apiservice/bicycle" sauna "git.blackfinn.de/apiservice/sauna" ) @@ -25,7 +25,7 @@ func main() { flag.Parse() // Start apis - bicycle.Start() + // bicycle.Start() sauna.Start() // Serve files from static folder diff --git a/webui/src/lib/Header.svelte b/webui/src/lib/Header.svelte index b06cc15..589c017 100644 --- a/webui/src/lib/Header.svelte +++ b/webui/src/lib/Header.svelte @@ -2,7 +2,6 @@ import Hamburger from "hamburger-menu-svelte"; const menu_list = [ { name: "Home", url: "/" }, - { name: "Bicycle", url: "/bicycle" }, { name: "Sauna", url: "/sauna" } ];