Skip to content

Commit b06d105

Browse files
authored
Merge pull request #5 from LReg/4-display-event-duration-on-webpage
Add duration pipe and display event duration on webpage
2 parents 7b27215 + 3a726b0 commit b06d105

File tree

15 files changed

+140
-211
lines changed

15 files changed

+140
-211
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
internal/ui/angular-ui/dist
1+
internal/ui/angular-ui/dist
2+
timetracker.db
3+
tt-arm
4+
.idea

build/buildARM64.sh

100644100755
File mode changed.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ go 1.24.3
55
require (
66
github.com/asdine/storm/v3 v3.2.1 // indirect
77
github.com/sirupsen/logrus v1.9.3 // indirect
8-
go.etcd.io/bbolt v1.4.1 // indirect
8+
go.etcd.io/bbolt v1.4.2 // indirect
99
golang.org/x/sys v0.33.0 // indirect
1010
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6Ac
2222
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
2323
go.etcd.io/bbolt v1.4.1 h1:5mOV+HWjIPLEAlUGMsveaUvK2+byZMFOzojoi7bh7uI=
2424
go.etcd.io/bbolt v1.4.1/go.mod h1:c8zu2BnXWTu2XM4XcICtbGSl9cFwsXtcf9zLt2OncM8=
25+
go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
26+
go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
2527
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
2628
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
2729
golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

internal/api/api-webserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
func setCorsHeaders(writer http.ResponseWriter) {
1616
writer.Header().Set("Access-Control-Allow-Origin", ui.WebserverUrl)
17+
// writer.Header().Set("Access-Control-Allow-Origin", "http://localhost:4200")
1718
writer.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
1819
writer.Header().Set("Access-Control-Allow-Headers", "Content-Type")
1920
}

internal/ui/angular-ui/angular.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,8 @@
9898
}
9999
}
100100
}
101+
},
102+
"cli": {
103+
"analytics": false
101104
}
102105
}

internal/ui/angular-ui/package-lock.json

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

internal/ui/angular-ui/src/app/components/time-slot/time-slot.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<div class="content-container">
1515
<div class="content">
1616
{{ timeSlot()?.Text }}
17+
<br>
18+
<span>{{ timeSlot()?.Start | duration:timeSlot()?.End }}</span>
1719
</div>
1820
</div>
1921
</div>

0 commit comments

Comments
 (0)