Skip to content

Commit

Permalink
Merge pull request #114 from jorgnyg/master
Browse files Browse the repository at this point in the history
  • Loading branch information
jmattheis authored Apr 22, 2022
2 parents fa3bf2c + 3b4294b commit 3d405dd
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sudo: required

language: go
go:
- "1.13.1"
- "1.18.1"

addons:
apt:
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ license-dir:
mkdir -p build/license || true

download-tools:
GO111MODULE=off go get -u golang.org/x/lint/golint
GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports
GO111MODULE=off go get -u github.com/gobuffalo/packr/v2/packr2
go install golang.org/x/tools/cmd/goimports@v0.1.10
go install github.com/gobuffalo/packr/v2/packr2@v2.7.1


generate-go:
go run hack/gqlgen/gqlgen.go
Expand All @@ -36,7 +36,6 @@ generate: generate-go generate-js

lint-go:
go vet ./...
golint -set_exit_status $(shell go list ./...)
goimports -l $(shell find . -type f -name '*.go' -not -path "./vendor/*")

lint-js:
Expand Down
1 change: 1 addition & 0 deletions ui/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png" />
<link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/favicon-192x192.png" />
<link rel="icon" type="image/png" sizes="256x256" href="%PUBLIC_URL%/favicon-256x256.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
Expand Down
29 changes: 29 additions & 0 deletions ui/public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "Traggo",
"short_name": "Traggo",
"description": "Tag-based time tracking",
"theme_color": "#9bd7fe",
"background_color": "#3f51b5",
"display": "standalone",
"scope": "/",
"start_url": "/",
"icons": [
{
"src": "/favicon-16x16.png",
"sizes": "16x16",
"type": "image/png"
}, {
"src": "/favicon-32x32.png",
"sizes": "32x32",
"type": "image/png"
}, {
"src": "/favicon-192x192.png",
"sizes": "192x192",
"type": "image/png"
}, {
"src": "/favicon-256x256.png",
"sizes": "256x256",
"type": "image/png"
}
]
}

0 comments on commit 3d405dd

Please sign in to comment.