diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml deleted file mode 100644 index 8a2d8ad..0000000 --- a/.forgejo/workflows/deploy.yml +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/app.py b/app.py index 7d21a14..baa9c6b 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 = pd.Timestamp.now() if df.empty or pd.isna(df['date'].max()) else max(df['date'].max(), pd.Timestamp.now()) + max_date = 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 57ea9af..743542b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,5 +9,8 @@ services: environment: - DB_FILE=/data/work_log.db volumes: - - ./:/data + - tracker_data:/data restart: unless-stopped + +volumes: + tracker_data: