Skip to content

Commit 4c3f8a0

Browse files
authored
Fix UI and icon display (#101)
1 parent b7c9069 commit 4c3f8a0

File tree

4 files changed

+32
-30
lines changed

4 files changed

+32
-30
lines changed

assets/ico/site.webmanifest

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2+
"start_url": "../#",
23
"name": "EV Charge Controller",
34
"short_name": "EV Charge Controller",
45
"icons": [
56
{
6-
"src": "ico/android-chrome-192x192.png",
7+
"src": "android-chrome-192x192.png",
78
"sizes": "192x192",
89
"type": "image/png"
910
},
1011
{
11-
"src": "ico/android-chrome-512x512.png",
12+
"src": "android-chrome-512x512.png",
1213
"sizes": "512x512",
1314
"type": "image/png"
1415
}

assets/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<div id="app">
4242
<nav class="navbar navbar-expand-lg navbar-light bg-light">
43-
<a class="navbar-brand" href="https://github.com/andig/evcc"><i class="text-primary far fa-leaf mr-2"></i>evcc</a>
43+
<a class="navbar-brand" href="https://github.com/andig/evcc"><i class="text-primary fas fa-leaf mr-2"></i>evcc</a>
4444
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
4545
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
4646
<span class="navbar-toggler-icon"></span>
@@ -62,7 +62,7 @@
6262
<div id="error">
6363
<div class="toast" data-delay="2000" style="position: absolute; top: 4rem; right: 0.5rem;">
6464
<div class="toast-header">
65-
<strong class="mr-auto"><i class="text-danger far fa-exclamation-triangle"></i> Error</strong>
65+
<strong class="mr-auto"><i class="text-danger fas fa-exclamation-triangle"></i> Error</strong>
6666
<small v-if="error.status">HTTP {{error.status}}</small>
6767
<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
6868
<span aria-hidden="true">&times;</span>
@@ -154,7 +154,7 @@ <h4 class="my-0 font-weight-normal">Wallbox</h4>
154154
<h2 class="card-title pricing-card-title">
155155
{{fmt(state.chargePower)}} <small class="text-muted">{{fmtUnit(state.chargePower)}}W</small>
156156
</h2>
157-
<p>Ladeleistung <i class="text-primary far fa-leaf" v-if="state.chargePower"></i></p>
157+
<p>Ladeleistung <i class="text-primary fas fa-leaf" v-if="state.chargePower"></i></p>
158158
</div>
159159
</div>
160160
</div>
@@ -170,10 +170,10 @@ <h4 class="my-0 font-weight-normal">Netz</h4>
170170
<h2 class="card-title pricing-card-title">{{fmt(state.gridPower)}} <small
171171
class="text-muted">{{fmtUnit(state.gridPower)}}W</small></h2>
172172
<p v-if="state.gridPower > 0">
173-
Bezug <i class="text-primary far fa-arrow-down"></i>
173+
Bezug <i class="text-primary fas fa-arrow-down"></i>
174174
</p>
175175
<p v-else>
176-
Einspeisung <i class="text-primary far fa-arrow-up"></i>
176+
Einspeisung <i class="text-primary fas fa-arrow-up"></i>
177177
</p>
178178
</div>
179179
</div>
@@ -190,7 +190,7 @@ <h4 class="my-0 font-weight-normal">PV</h4>
190190
<h2 class="card-title pricing-card-title">
191191
{{fmt(state.pvPower)}} <small class="text-muted">{{fmtUnit(state.pvPower)}}W</small>
192192
</h2>
193-
<p>Erzeugung <i class="text-primary far fas fa-sun" v-if="false"></i></p>
193+
<p>Erzeugung <i class="text-primary fas fas fa-sun" v-if="false"></i></p>
194194
</div>
195195
</div>
196196
</div>

server/assets.go

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/socket.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,13 @@ func NewSocketHub() *SocketHub {
8585
func (h *SocketHub) encode(v core.Param) ([]byte, error) {
8686
var s string
8787
switch val := v.Val.(type) {
88-
case string:
88+
case time.Duration:
89+
// must be before stringer to convert to seconds instead of string
90+
s = fmt.Sprintf("{\"%s\": %d}", v.Key, int64(val.Seconds()))
91+
case fmt.Stringer, string:
8992
s = fmt.Sprintf("{\"%s\": \"%s\"}", v.Key, val)
9093
case float64:
9194
s = fmt.Sprintf("{\"%s\": %.3f}", v.Key, val)
92-
case time.Duration:
93-
s = fmt.Sprintf("{\"%s\": %d}", v.Key, int64(val.Seconds()))
9495
default:
9596
s = fmt.Sprintf("{\"%s\": %v}", v.Key, val)
9697
}

0 commit comments

Comments
 (0)