9 Commits

Author SHA1 Message Date
arrelin
67f72e05a1 try to do better 2026-02-24 13:18:25 +03:00
arrelin
7dc0ebf3c1 try to do better 2026-02-24 13:09:49 +03:00
arrelin
e9a588e479 try to do better 2026-02-24 13:07:08 +03:00
arrelin
9eaa3de231 try to do better 2026-02-24 13:02:31 +03:00
arrelin
80f2fa55cd try to do better 2026-02-24 12:54:19 +03:00
38ffa260b3 Merge pull request 'try to do better' (#24) from feature/history into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 28s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/24
2026-02-12 15:58:17 +00:00
arrelin
b90e002f28 try to do better 2026-02-12 18:57:52 +03:00
0e856b8904 Merge pull request 'try to do better' (#23) from feature/history into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/23
2026-02-12 15:51:38 +00:00
arrelin
62aa6b2215 try to do better 2026-02-12 18:51:17 +03:00
3 changed files with 8 additions and 2 deletions

View File

@@ -29,3 +29,10 @@ jobs:
- name: Logout - name: Logout
run: docker logout 192.168.31.100:3847 run: docker logout 192.168.31.100:3847
- name: Trigger Coolify redeploy
run: |
curl -s -H "Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}" \
"http://192.168.31.100:8000/api/v1/deploy?uuid=msoc4skogk44ckc84wokocw0&force=true"

View File

@@ -153,7 +153,6 @@ impl ExpenseService {
.map(|((year, month), expenses)| { .map(|((year, month), expenses)| {
let total_amount: Decimal = expenses let total_amount: Decimal = expenses
.iter() .iter()
.filter(|e| e.active)
.map(|e| e.amount) .map(|e| e.amount)
.sum(); .sum();
MonthlyExpenseGroup { MonthlyExpenseGroup {

View File

@@ -3,7 +3,7 @@ import { useParams, useNavigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { categoryApi, expenseApi, inviteLinkApi } from '../api/client'; import { categoryApi, expenseApi, inviteLinkApi } from '../api/client';
import { useStore } from '../store/useStore'; import { useStore } from '../store/useStore';
import type { Category, Expense, InviteLinkResponse, ExpenseHistoryResponse } from '../types'; import type { Category, InviteLinkResponse, ExpenseHistoryResponse } from '../types';
import { import {
Wallet, Wallet,
TrendingDown, TrendingDown,