From e3c1748d6a566b0eadb3234dbafb4546552ce041 Mon Sep 17 00:00:00 2001 From: Feiko Wielsma Date: Wed, 25 Mar 2026 12:58:16 +0100 Subject: [PATCH 1/2] Add Forgejo actions deployment workflow --- .forgejo/workflows/deploy.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .forgejo/workflows/deploy.yml diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 0000000..8a2d8ad --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,22 @@ +name: Deploy via SSH + +on: + push: + branches: + - main + +jobs: + deploy: + runs-on: ubuntu-latest # Make sure you have a runner with this label + steps: + - name: Deploy to Server + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.SSH_HOST }} + username: ${{ secrets.SSH_USER }} + key: ${{ secrets.SSH_PRIVATE_KEY }} + port: 22 # or 8022 based on your previous scp command + script: | + cd ~/Git/tracker + git pull origin main + docker compose up -d --build From ad48295484c0c35d89fc2e837b1e7e720ec39426 Mon Sep 17 00:00:00 2001 From: Feiko Wielsma Date: Wed, 25 Mar 2026 13:11:23 +0100 Subject: [PATCH 2/2] Fix NaT bug on empty states and update volume type --- app.py | 2 +- docker-compose.yml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index baa9c6b..7d21a14 100644 --- a/app.py +++ b/app.py @@ -190,7 +190,7 @@ with col2: # Reindex to ensure we cover from START_DATE to Today (or Max Date) # This ensures weeks with 0 work are counted in the average - max_date = max(df['date'].max(), pd.Timestamp.now()) + max_date = pd.Timestamp.now() if df.empty or pd.isna(df['date'].max()) else max(df['date'].max(), pd.Timestamp.now()) full_weeks = pd.date_range(start=START_DATE, end=max_date, freq='W-MON') weekly_data = weekly_data.reindex(full_weeks, fill_value=0) diff --git a/docker-compose.yml b/docker-compose.yml index 743542b..57ea9af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,5 @@ services: environment: - DB_FILE=/data/work_log.db volumes: - - tracker_data:/data + - ./:/data restart: unless-stopped - -volumes: - tracker_data: