diff --git a/.forgejo/workflows/build-and-release.yaml b/.forgejo/workflows/build-and-release.yaml index 3351bbe..6488a39 100644 --- a/.forgejo/workflows/build-and-release.yaml +++ b/.forgejo/workflows/build-and-release.yaml @@ -7,7 +7,7 @@ jobs: steps: - run: apk add --no-cache nodejs git - name: login to container registry - run: echo "${{ secrets.PACKAGE_PUBLISH_TOKEN }}" | docker login --username finn --password-stdin git.janky.solutions + run: echo "${{ secrets.PACKAGE_PUBLISH_TOKEN }}" | docker login --username ${{ secrets.PACKAGE_PUBLISH_USER }} --password-stdin git.janky.solutions - name: gather metadata for container image tags uses: https://github.com/docker/metadata-action@v5 id: meta @@ -20,7 +20,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: true + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }} build-args: | VERSION_STRING=${{ env.GITHUB_REF_NAME }} - name: update hassio-addons diff --git a/config/version.go b/config/version.go index d611b7c..c718d59 100644 --- a/config/version.go +++ b/config/version.go @@ -26,5 +26,9 @@ func init() { break } } + + if Version == "" { + Version = "development" + } } } diff --git a/frontend/frontend.go b/frontend/frontend.go index 526381c..8aa240d 100644 --- a/frontend/frontend.go +++ b/frontend/frontend.go @@ -2,7 +2,6 @@ package frontend import ( "embed" - "fmt" "html/template" "io/fs" "time" @@ -20,7 +19,7 @@ var ( Templates *template.Template funcs = template.FuncMap{ - "version": func() string { return fmt.Sprintf("better-zwave-locks %s", config.Version) }, + "version": func() string { return config.Version }, "time_since": func(t time.Time) string { return time.Since(t).Round(time.Second).String() }, } ) diff --git a/frontend/header.html b/frontend/header.html index 84d62b3..d5fcf75 100644 --- a/frontend/header.html +++ b/frontend/header.html @@ -5,7 +5,7 @@ Better Z-Wave Locks for Home Assistant - + diff --git a/frontend/index.html b/frontend/index.html index 8325a1a..725dec7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,28 +1,11 @@ {{ template "header.html" . }}

Better Z-Wave Locks

-

-
locks
- + + {{ range .Locks }} + +

{{ if eq .Name "" }}Lock #{{ .ZwaveDeviceID }}{{ else }}{{ .Name }}{{ end }}

+ + {{ end }} + {{ template "footer.html" }} diff --git a/frontend/lock.html b/frontend/lock.html index 50a9dcd..38b708b 100644 --- a/frontend/lock.html +++ b/frontend/lock.html @@ -2,24 +2,18 @@
{{ if eq .Data.lock.Name "" }}Lock #{{ .Data.lock.ID }}{{ else }}{{ .Data.lock.Name }}{{ end }}
[ rename ]

- - - - - - - - + + + Name + Code + {{ range $_, $code := .Data.codes }} - - - - - - - + + {{ $code.Name }} + {{ $code.Code }} + {{ end }} -
SlotNameCodeEnabled?Actions
{{ $code.Slot }}{{ $code.Name }}{{ $code.Code }}{{ if $code.Enabled }}enabled{{ else }}disabled{{ end }}[ edit ]
+

diff --git a/frontend/static/main.css b/frontend/static/main.css index 321d64d..a00ed38 100644 --- a/frontend/static/main.css +++ b/frontend/static/main.css @@ -30,9 +30,24 @@ header { } .code-enabled { - background-color: #0a0; + background-color: #050; } .table { width: 100%; + display: flex; + flex-direction: column; +} + +.table-row { + border-bottom: solid #999 1px; + /* background-color: #333; */ + height: 3em; + display: flex; + flex-direction: row; + justify-content: space-around; +} + +.table-row:first { + border-top: solid #999 1px; } diff --git a/httpserver/server.go b/httpserver/server.go index f615e95..6c5e004 100644 --- a/httpserver/server.go +++ b/httpserver/server.go @@ -28,7 +28,7 @@ func ListenAndServe(zwaveClient *zwavejs.Client) { server.Use(accessLogMiddleware) server.RouteNotFound("/*", tmpl("404.html")) - server.StaticFS("/static", frontend.Static) + server.StaticFS("/static-"+config.Version, frontend.Static) server.GET("/", indexHandler) server.GET("/locks/:lock", lockHandler) server.GET("/locks/:lock/edit", lockEditHandler)