Skip to content

Commit c8606aa

Browse files
author
dev-warrior777
committed
client: Re-work profile dropdown to show simplified, user-facing app version
1 parent a939101 commit c8606aa

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

client/cmd/bisonw-desktop/app.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import (
5757
"runtime"
5858
"runtime/debug"
5959
"runtime/pprof"
60+
"strings"
6061
"sync"
6162
"sync/atomic"
6263
"syscall"
@@ -222,7 +223,10 @@ func mainCore() error {
222223
}()
223224
}
224225

225-
webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc, app.Version))
226+
parts := strings.Split(app.Version, "-")
227+
userAppVersion := parts[0]
228+
229+
webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc, userAppVersion))
226230
if err != nil {
227231
return fmt.Errorf("failed creating web server: %w", err)
228232
}

client/cmd/bisonw/main.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func runCore(cfg *app.Config) error {
154154
}
155155

156156
if !cfg.NoWeb {
157-
webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc, app.Version))
157+
webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc, userAppVersion(app.Version)))
158158
if err != nil {
159159
return fmt.Errorf("failed creating web server: %w", err)
160160
}
@@ -231,3 +231,9 @@ func promptShutdown(clientCore *core.Core) bool {
231231
fmt.Println("Shutdown aborted.")
232232
return false
233233
}
234+
235+
// userAppVersion returns a simplified version string for end users.
236+
func userAppVersion(fullAppVersion string) string {
237+
parts := strings.Split(fullAppVersion, "-")
238+
return parts[0]
239+
}

client/webserver/site/src/html/bodybuilder.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@
118118
<span class="ico-profile fs16 me-2"></span>
119119
[[[Sign Out]]]
120120
</div>
121-
<div class="demi d-flex align-items-center py-1" id="version">
122-
<br>
121+
<div class="border-bottom py-2"></div>
122+
<div class="demi-sans d-flex align-items-center py-1" id="version">
123123
<div class="flex-center">
124124
[[[Version]]] {{.Version}}
125125
</div>
126126
</div>
127127
</div>
128128

129+
129130
</header>
130131
{{end}}
131132

0 commit comments

Comments
 (0)