diff --git a/CHANGELOG.md b/CHANGELOG.md index c8667d6..b40fe48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Features - API endpoint & UI controls to attach tags to projects. (e.g "work", "web", "ui") -- Ability to filter statistics by tag. +- Ability to filter statistics by tag and view their aggregated statistics. + +## Improvements + +- Reduced the amount of api calls made by the UI. +- The docker image will apply the database migration on boot. ## Bug fixes diff --git a/Dockerfile b/Dockerfile index 3311aaa..661108a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,7 @@ COPY --from=dashboard-builder /usr/src/app/dist /app/bin/dashboard COPY --from=server-builder /app/bin/hakatime /app/bin/hakatime COPY docker/init.sql /app/init.sql COPY docker/start.sh /app/start.sh +COPY migrations/ /app/migrations RUN apk add --no-cache \ bash \ diff --git a/Dockerfile.arm b/Dockerfile.arm index 213b7ef..24def62 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -56,6 +56,7 @@ COPY --from=dashboard-builder /usr/src/app/dist /app/bin/dashboard COPY --from=server-builder /app/bin/hakatime /app/bin/hakatime COPY docker/init.sql /app/init.sql COPY docker/start.sh /app/start.sh +COPY migrations/ /app/migrations ENV HAKA_PORT 8080 ENV HAKA_DASHBOARD_PATH /app/bin/dashboard diff --git a/README.md b/README.md index 497bfa4..3491f01 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ It comes together with a dashboard which provides a graphical representation of ## Features - Import Wakatime activity using an API token and a range of dates. +- Group projects together with tags (e.g `#work`, `#personal`) and view their aggregated statistics. - User registration & login through the UI. - Badge generation for a project that displays that total amount of hours spent for a configurable time period. [![my-app](https://hakatime-demo.mtx-dev.xyz/badge/svg/f8c0f834-3747-4d3f-965b-6fa08c6dea94?days=14)](https://hakatime-demo.mtx-dev.xyz/badge/svg/f8c0f834-3747-4d3f-965b-6fa08c6dea94?days=7) diff --git a/docker/start.sh b/docker/start.sh index 9df4742..5c90fa0 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -23,6 +23,8 @@ else echo "Database ${HAKA_DB_NAME} initialized" fi +/app/bin/hakatime run-migrations -d /app/migrations + echo "Starting hakatime server ..." /app/bin/hakatime run