diff --git a/.github/workflows/hub.yml b/.github/workflows/hub.yml
index bd4d5c0..222efc5 100644
--- a/.github/workflows/hub.yml
+++ b/.github/workflows/hub.yml
@@ -1,8 +1,8 @@
-name: ci
+name: Build docker image
on:
- push:
- branches: master
+ release:
+ types: [published]
jobs:
multi:
@@ -26,17 +26,20 @@ jobs:
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
+ - name: Parse the git tag
+ id: get_tag
+ run: echo ::set-output name=TAG::$(echo $GITHUB_REF | cut -d / -f 3)
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
+ password: ${{ secrets.DOCKER_TOKEN }}
- name: Login to GitHub
uses: docker/login-action@v1
with:
registry: ghcr.io
- username: ${{ github.repository_owner }}
- password: ${{ secrets.CR_PAT }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
with:
@@ -49,7 +52,7 @@ jobs:
# cache-from: type=local,src=/tmp/.buildx-cache
# cache-to: type=local,dest=/tmp/.buildx-cache
tags: |
- akhilrex/hammond:latest
- akhilrex/hammond:1.0.0
- ghcr.io/akhilrex/hammond:latest
- ghcr.io/akhilrex/hammond:1.0.0
+ alfhou/hammond:latest
+ alfhou/hammond:${{ steps.get_tag.outputs.TAG }}
+ ghcr.io/alfhou/hammond:latest
+ ghcr.io/alfhou/hammond:${{ steps.get_tag.outputs.TAG }}
diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml
new file mode 100644
index 0000000..343e8ad
--- /dev/null
+++ b/.github/workflows/test-go.yml
@@ -0,0 +1,16 @@
+on: [push, pull_request]
+name: Test server
+jobs:
+ test:
+ strategy:
+ matrix:
+ go-version: [1.17.x, 1.18.x]
+ os: [ubuntu-latest]
+ runs-on: ${{ matrix.os }}
+ steps:
+ - uses: actions/setup-go@v3
+ with:
+ go-version: ${{ matrix.go-version }}
+ - uses: actions/checkout@v3
+ - run: go test ./...
+ working-directory: server
diff --git a/Dockerfile b/Dockerfile
index a9b7400..48682b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN npm run build
FROM alpine:latest
-LABEL org.opencontainers.image.source="https://github.com/akhilrex/hammond"
+LABEL org.opencontainers.image.source="https://github.com/alfhou/hammond"
ENV CONFIG=/config
ENV DATA=/assets
ENV UID=998
diff --git a/README.md b/README.md
index 07e37d6..a646a14 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,16 @@
-[![Contributors][contributors-shield]][contributors-url] [![Forks][forks-shield]][forks-url] [![Stargazers][stars-shield]][stars-url] [![Issues][issues-shield]][issues-url] [![MIT License][license-shield]][license-url] [![LinkedIn][linkedin-shield]][linkedin-url]
-
-
-
- -
Current Version - 2022.07.06
A self-hosted vehicle expense tracking system with support for multiple users.
- Explore the docs »
+ Explore the docs »
-
- Report Bug
+ Report Bug
·
- Request Feature
+ Request Feature
·
Screenshots
Quick Entry
+{{ $tc('quickentry',1) }}
Take a pic of the invoice or the fuel pump display to make an entry later.
{{ $t('quickentrydesc') }}
diff --git a/ui/src/components/shareVehicle.vue b/ui/src/components/shareVehicle.vue
index d324b50..35ed5b1 100644
--- a/ui/src/components/shareVehicle.vue
+++ b/ui/src/components/shareVehicle.vue
@@ -55,7 +55,7 @@ export default {
return
}
this.$buefy.dialog.confirm({
- title: 'Transfer Vehicle',
+ title: this.$t('transfervehicle'),
message: 'Are you sure you want to do this? You will lose ownership and all editing rights if you confirm.',
cancelText: 'Cancel',
confirmText: 'Go Ahead',
@@ -90,7 +90,7 @@ export default {
Share {{ vehicle.nickname }}
+ {{ $t('share') }} {{ vehicle.nickname }}