docs: update analytics changelog

test(analytics): verify SQL aggregates
test(analytics): cover net category semantics
2026-08-19 09:14:57 +03:00 · 2026-08-19 09:12:43 +03:00 · 2026-08-19 07:49:54 +03:00 · 2026-08-18 23:09:40 +03:00 · 2026-08-16 06:29:58 +00:00 · 2026-08-16 09:19:46 +03:00
36 changed files with 1829 additions and 1762 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ history.xlsx
 match_analysis.py
 match_report.txt
 statements/
+temp/
 .cursor/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+## [Frontend 0.9.0 / Backend 0.6.2] - 2026-08-19
+
+### Changed
+
+- Analytics now calculate net income and expenses by category type: refunds reduce the original expense category and internal transfers no longer affect P&L.
+- Added a separate cash-flow summary with incoming, outgoing, and transfer amounts.
+- Added unit and transactional SQL checks for analytics calculations.
+
+## [0.8.7] - 2026-08-16
+
+### Changed
+
+- Completed the frontend CSS class migration to BEM naming and aligned component styles with the design system.
--- a/README.md
+++ b/README.md
@@ -15,13 +15,15 @@ family_budget/

 ## Tech stack

-| Layer      | Choice                 | Rationale                                              |
-|----------  |------------------------|--------------------------------------------------------|
-| Backend    | Express + TypeScript   | Simple, well-known, sufficient for a small local app   |
-| Frontend   | React + Vite + TS      | Fast dev experience, modern tooling                    |
-| Database   | PostgreSQL             | Deployed on Synology NAS                               |
-| Migrations | Knex                   | Lightweight, SQL-close, supports seeds                 |
-| Shared     | Pure TypeScript types  | Zero-runtime, imported by both backend and frontend    |
+
+| Layer      | Choice                | Rationale                                            |
+| ---------- | --------------------- | ---------------------------------------------------- |
+| Backend    | Express + TypeScript  | Simple, well-known, sufficient for a small local app |
+| Frontend   | React + Vite + TS     | Fast dev experience, modern tooling                  |
+| Database   | PostgreSQL            | Deployed on Synology NAS                             |
+| Migrations | Knex                  | Lightweight, SQL-close, supports seeds               |
+| Shared     | Pure TypeScript types | Zero-runtime, imported by both backend and frontend  |
+

 ## Prerequisites

@@ -39,4 +41,4 @@ npm install
 npm run build -w shared
 ```

-See `backend/README.md` and `frontend/README.md` for per-package instructions.
+See `backend/README.md` and `frontend/README.md` for per-package instructions.
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@family-budget/backend",
-  "version": "0.5.12",
+  "version": "0.6.2",
  "private": true,
  "scripts": {
    "dev": "tsx watch src/app.ts",
@@ -8,6 +8,8 @@
    "start": "node dist/app.js",
    "migrate": "tsx src/db/migrate.ts",
    "migrate:prod": "node dist/db/migrate.js",
+    "test:analytics": "tsx src/services/analyticsSemantics.test.ts",
+    "test:analytics:db": "NODE_ENV=test tsx src/services/analytics.integration.test.ts",
    "test:llm": "tsx src/scripts/testLlm.ts"
  },
  "dependencies": {
--- a/backend/src/services/analytics.integration.test.ts
+++ b/backend/src/services/analytics.integration.test.ts
@@ -0,0 +1,42 @@
+import assert from 'node:assert/strict';
+import { pool } from '../db/pool';
+import { getByCategory, getSummary, getTimeseries } from './analytics';
+
+async function testQueries(): Promise<void> {
+  const client = await pool.connect();
+  try {
+    await client.query('BEGIN');
+    const account = await client.query("INSERT INTO accounts (bank, account_number, currency) VALUES ('TEST', 'analytics-test-1', 'RUB') RETURNING id");
+    const otherAccount = await client.query("INSERT INTO accounts (bank, account_number, currency) VALUES ('TEST', 'analytics-test-2', 'RUB') RETURNING id");
+    const categories = await client.query("INSERT INTO categories (name, type) VALUES ('Тест расход', 'expense'), ('Тест доход', 'income'), ('Тест перевод', 'transfer') RETURNING id, type");
+    const accountId = Number(account.rows[0].id);
+    const otherAccountId = Number(otherAccount.rows[0].id);
+    const categoryId = Object.fromEntries(categories.rows.map((row) => [row.type, Number(row.id)]));
+    const insert = (account: number, at: string, amount: number, category: number, fingerprint: string) => client.query(
+      "INSERT INTO transactions (account_id, operation_at, amount_signed, commission, description, direction, fingerprint, category_id, is_category_confirmed) VALUES ($1, $2, $3, 0, 'test', CASE WHEN $3 < 0 THEN 'expense' ELSE 'income' END, $4, $5, TRUE)",
+      [account, at, amount, fingerprint, category],
+    );
+
+    await insert(accountId, '2026-07-01T12:00:00+03:00', -10_000, categoryId.expense, 'analytics-test-1');
+    await insert(accountId, '2026-07-02T12:00:00+03:00', 4_000, categoryId.expense, 'analytics-test-2');
+    await insert(accountId, '2026-07-03T12:00:00+03:00', 20_000, categoryId.income, 'analytics-test-3');
+    await insert(accountId, '2026-07-04T12:00:00+03:00', -5_000, categoryId.income, 'analytics-test-4');
+    await insert(accountId, '2026-07-05T12:00:00+03:00', -3_000, categoryId.transfer, 'analytics-test-5');
+    await insert(otherAccountId, '2026-07-01T12:00:00+03:00', -99_000, categoryId.expense, 'analytics-test-6');
+    await insert(accountId, '2026-08-01T12:00:00+03:00', -7_000, categoryId.expense, 'analytics-test-7');
+
+    const params = { from: '2026-07-01', to: '2026-07-31', accountId, onlyConfirmed: true };
+    const summary = await getSummary(params, client);
+    assert.deepEqual({ expense: summary.totalExpense, income: summary.totalIncome, net: summary.net, transferOut: summary.transferOutflow }, { expense: 6_000, income: 15_000, net: 9_000, transferOut: 3_000 });
+    assert.equal((await getSummary({ ...params, from: '2026-08-01', to: '2026-08-31' }, client)).totalExpense, 7_000);
+    assert.deepEqual((await getByCategory(params, client)).map((item) => item.amount), [6_000]);
+    const timeseries = await getTimeseries({ ...params, granularity: 'month' }, client);
+    assert.equal(timeseries[0].expenseAmount, 6_000);
+    assert.equal(timeseries[0].incomeAmount, 15_000);
+  } finally {
+    await client.query('ROLLBACK');
+    client.release();
+  }
+}
+
+testQueries().then(() => console.log('analytics SQL: OK')).finally(() => pool.end());
--- a/backend/src/services/analytics.ts
+++ b/backend/src/services/analytics.ts
@@ -1,4 +1,5 @@
 import { pool } from '../db/pool';
+import { effectiveAmountCase } from './analyticsSemantics';
 import type {
  AnalyticsSummaryResponse,
  TopCategory,
@@ -7,6 +8,8 @@ import type {
  Granularity,
 } from '@family-budget/shared';

+type Queryable = Pick<typeof pool, 'query'>;
+
 interface BaseParams {
  from: string;
  to: string;
@@ -14,6 +17,24 @@ interface BaseParams {
  onlyConfirmed?: boolean;
 }

+const effectiveAmount = effectiveAmountCase('t');
+
+function analyticsTransactions(where: string): string {
+  return `
+    WITH analytics_transactions AS (
+      SELECT
+        t.id,
+        t.operation_at,
+        COALESCE(c.type, t.direction) AS analytic_type,
+        COALESCE(t.category_id, 0) AS category_id,
+        COALESCE(c.name, 'Без категории') AS category_name,
+        ${effectiveAmount} AS effective_amount
+      FROM transactions t
+      LEFT JOIN categories c ON c.id = t.category_id
+      ${where}
+    )`;
+}
+
 function buildBaseConditions(
  params: BaseParams,
  startIdx: number,
@@ -42,96 +63,45 @@ function buildBaseConditions(
  return { conditions, values, nextIdx: idx };
 }

-export async function getSummary(params: BaseParams): Promise<AnalyticsSummaryResponse> {
+export async function getSummary(
+  params: BaseParams,
+  db: Queryable = pool,
+): Promise<AnalyticsSummaryResponse> {
  const { conditions, values } = buildBaseConditions(params, 1);
  const where = 'WHERE ' + conditions.join(' AND ');

-  const totalsResult = await pool.query(
-    `WITH investment_ref AS (
-       SELECT (
-         SELECT id
-         FROM categories
-         WHERE name = 'Инвестиции' AND type = 'transfer'
-         ORDER BY id ASC
-         LIMIT 1
-       ) AS investment_category_id
+  const totalsResult = await db.query(
+    `${analyticsTransactions(where)},
+     category_net AS (
+       SELECT category_id, category_name, analytic_type, SUM(effective_amount)::bigint AS amount
+       FROM analytics_transactions
+       GROUP BY category_id, category_name, analytic_type
     )
     SELECT
-       COALESCE(SUM(
-         CASE
-           WHEN (t.direction = 'expense' OR (t.direction = 'transfer' AND t.amount_signed < 0))
-             AND (
-               ir.investment_category_id IS NULL
-               OR t.category_id IS DISTINCT FROM ir.investment_category_id
-             )
-             THEN ABS(t.amount_signed) + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS total_expense,
-       COALESCE(SUM(
-         CASE
-           WHEN t.direction = 'income'
-             AND (
-               ir.investment_category_id IS NULL
-               OR t.category_id IS DISTINCT FROM ir.investment_category_id
-             )
-             THEN t.amount_signed + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS total_income,
-       COALESCE(SUM(
-         CASE
-           WHEN t.amount_signed < 0
-             AND ir.investment_category_id IS NOT NULL
-             AND t.category_id = ir.investment_category_id
-             THEN ABS(t.amount_signed) + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS investment_outflow,
-       COALESCE(SUM(
-         CASE
-           WHEN t.amount_signed > 0
-             AND ir.investment_category_id IS NOT NULL
-             AND t.category_id = ir.investment_category_id
-             THEN t.amount_signed + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS investment_income_excluded
-     FROM transactions t
-     CROSS JOIN investment_ref ir
-     ${where}`,
+       COALESCE(SUM(GREATEST(-amount, 0)) FILTER (WHERE analytic_type = 'expense'), 0)::bigint AS total_expense,
+       COALESCE(SUM(GREATEST(amount, 0)) FILTER (WHERE analytic_type = 'income'), 0)::bigint AS total_income,
+       COALESCE((SELECT SUM(GREATEST(effective_amount, 0)) FROM analytics_transactions), 0)::bigint AS cash_inflow,
+       COALESCE((SELECT SUM(GREATEST(-effective_amount, 0)) FROM analytics_transactions), 0)::bigint AS cash_outflow,
+       COALESCE((SELECT SUM(GREATEST(effective_amount, 0)) FROM analytics_transactions WHERE analytic_type = 'transfer'), 0)::bigint AS transfer_inflow,
+       COALESCE((SELECT SUM(GREATEST(-effective_amount, 0)) FROM analytics_transactions WHERE analytic_type = 'transfer'), 0)::bigint AS transfer_outflow
+     FROM category_net`,
    values,
  );

  const totalExpense = Number(totalsResult.rows[0].total_expense);
  const totalIncome = Number(totalsResult.rows[0].total_income);
-  const investmentOutflow = Number(totalsResult.rows[0].investment_outflow);
-  const investmentIncomeExcluded = Number(totalsResult.rows[0].investment_income_excluded);
+  const cashInflow = Number(totalsResult.rows[0].cash_inflow);
+  const cashOutflow = Number(totalsResult.rows[0].cash_outflow);
+  const transferInflow = Number(totalsResult.rows[0].transfer_inflow);
+  const transferOutflow = Number(totalsResult.rows[0].transfer_outflow);

-  const topResult = await pool.query(
-    `WITH investment_ref AS (
-       SELECT (
-         SELECT id
-         FROM categories
-         WHERE name = 'Инвестиции' AND type = 'transfer'
-         ORDER BY id ASC
-         LIMIT 1
-       ) AS investment_category_id
-     )
-     SELECT
-       COALESCE(t.category_id, 0)::bigint AS category_id,
-       COALESCE(c.name, 'Без категории') AS category_name,
-       SUM(ABS(t.amount_signed) + t.commission)::bigint AS amount
-     FROM transactions t
-     CROSS JOIN investment_ref ir
-     LEFT JOIN categories c ON c.id = t.category_id
-     ${where}
-       AND (t.direction = 'expense' OR (t.direction = 'transfer' AND t.amount_signed < 0))
-       AND (
-         ir.investment_category_id IS NULL
-         OR t.category_id IS DISTINCT FROM ir.investment_category_id
-       )
-     GROUP BY COALESCE(t.category_id, 0), COALESCE(c.name, 'Без категории')
+  const topResult = await db.query(
+    `${analyticsTransactions(where)}
+     SELECT category_id::bigint, category_name, GREATEST(-SUM(effective_amount), 0)::bigint AS amount
+     FROM analytics_transactions
+     WHERE analytic_type = 'expense'
+     GROUP BY category_id, category_name
+     HAVING SUM(effective_amount) < 0
     ORDER BY amount DESC
     LIMIT 5`,
    values,
@@ -148,68 +118,39 @@ export async function getSummary(params: BaseParams): Promise<AnalyticsSummaryRe
    totalExpense,
    totalIncome,
    net: totalIncome - totalExpense,
-    investmentOutflow,
-    investmentIncomeExcluded,
+    cashInflow,
+    cashOutflow,
+    transferInflow,
+    transferOutflow,
+    cashNet: cashInflow - cashOutflow,
    topCategories,
  };
 }

-export async function getByCategory(params: BaseParams): Promise<ByCategoryItem[]> {
+export async function getByCategory(
+  params: BaseParams,
+  db: Queryable = pool,
+): Promise<ByCategoryItem[]> {
  const { conditions, values } = buildBaseConditions(params, 1);
  const where = 'WHERE ' + conditions.join(' AND ');

-  const totalResult = await pool.query(
-    `WITH investment_ref AS (
-       SELECT (
-         SELECT id
-         FROM categories
-         WHERE name = 'Инвестиции' AND type = 'transfer'
-         ORDER BY id ASC
-         LIMIT 1
-       ) AS investment_category_id
-     )
-     SELECT COALESCE(SUM(ABS(t.amount_signed) + t.commission), 0)::bigint AS total
-     FROM transactions t
-     CROSS JOIN investment_ref ir
-     ${where}
-       AND (t.direction = 'expense' OR (t.direction = 'transfer' AND t.amount_signed < 0))
-       AND (
-         ir.investment_category_id IS NULL
-         OR t.category_id IS DISTINCT FROM ir.investment_category_id
-       )`,
-    values,
-  );
-  const total = Number(totalResult.rows[0].total);
-
-  const { rows } = await pool.query(
-    `WITH investment_ref AS (
-       SELECT (
-         SELECT id
-         FROM categories
-         WHERE name = 'Инвестиции' AND type = 'transfer'
-         ORDER BY id ASC
-         LIMIT 1
-       ) AS investment_category_id
-     )
+  const { rows } = await db.query(
+    `${analyticsTransactions(where)}
     SELECT
-       COALESCE(t.category_id, 0)::bigint AS category_id,
-       COALESCE(c.name, 'Без категории') AS category_name,
-       SUM(ABS(t.amount_signed) + t.commission)::bigint AS amount,
+       category_id::bigint,
+       category_name,
+       GREATEST(-SUM(effective_amount), 0)::bigint AS amount,
       COUNT(*)::int AS tx_count
-     FROM transactions t
-     CROSS JOIN investment_ref ir
-     LEFT JOIN categories c ON c.id = t.category_id
-     ${where}
-       AND (t.direction = 'expense' OR (t.direction = 'transfer' AND t.amount_signed < 0))
-       AND (
-         ir.investment_category_id IS NULL
-         OR t.category_id IS DISTINCT FROM ir.investment_category_id
-       )
-     GROUP BY COALESCE(t.category_id, 0), COALESCE(c.name, 'Без категории')
+     FROM analytics_transactions
+     WHERE analytic_type = 'expense'
+     GROUP BY category_id, category_name
+     HAVING SUM(effective_amount) < 0
     ORDER BY amount DESC`,
    values,
  );

+  const total = rows.reduce((sum, row) => sum + Number(row.amount), 0);
+
  return rows.map((r) => ({
    categoryId: r.category_id != null ? Number(r.category_id) : 0,
    categoryName: r.category_name ?? 'Без категории',
@@ -221,6 +162,7 @@ export async function getByCategory(params: BaseParams): Promise<ByCategoryItem[

 export async function getTimeseries(
  params: BaseParams & { categoryId?: number; granularity: Granularity },
+  db: Queryable = pool,
 ): Promise<TimeseriesItem[]> {
  let truncExpr: string;
  let intervalStr: string;
@@ -265,61 +207,38 @@ export async function getTimeseries(

  const txWhere = txConditions.join(' AND ');

-  const { rows } = await pool.query(
+  const { rows } = await db.query(
    `WITH periods AS (
       SELECT
         gs::date AS period_start,
         ${periodEndExpr} AS period_end
       FROM generate_series(${truncExpr}, $2::date, '${intervalStr}'::interval) gs
     ),
-     investment_ref AS (
-       SELECT (
-         SELECT id
-         FROM categories
-         WHERE name = 'Инвестиции' AND type = 'transfer'
-         ORDER BY id ASC
-         LIMIT 1
-       ) AS investment_category_id
+     period_transactions AS (
+       SELECT
+         p.period_start,
+         p.period_end,
+         COALESCE(c.type, t.direction) AS analytic_type,
+         COALESCE(t.category_id, 0) AS category_id,
+         ${effectiveAmount} AS effective_amount
+       FROM periods p
+       LEFT JOIN transactions t ON ${txWhere}
+       LEFT JOIN categories c ON c.id = t.category_id
+     ),
+     period_category_net AS (
+       SELECT period_start, period_end, analytic_type, category_id, SUM(effective_amount)::bigint AS amount
+       FROM period_transactions
+       GROUP BY period_start, period_end, analytic_type, category_id
     )
     SELECT
-       p.period_start,
-       p.period_end,
-       COALESCE(SUM(
-         CASE
-           WHEN (t.direction = 'expense' OR (t.direction = 'transfer' AND t.amount_signed < 0))
-             AND (
-               ir.investment_category_id IS NULL
-               OR t.category_id IS DISTINCT FROM ir.investment_category_id
-             )
-             THEN ABS(t.amount_signed) + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS expense_amount,
-       COALESCE(SUM(
-         CASE
-           WHEN t.direction = 'income'
-             AND (
-               ir.investment_category_id IS NULL
-               OR t.category_id IS DISTINCT FROM ir.investment_category_id
-             )
-             THEN t.amount_signed + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS income_amount,
-       COALESCE(SUM(
-         CASE
-           WHEN t.amount_signed < 0
-             AND ir.investment_category_id IS NOT NULL
-             AND t.category_id = ir.investment_category_id
-             THEN ABS(t.amount_signed) + t.commission
-           ELSE 0
-         END
-       ), 0)::bigint AS investment_outflow
-     FROM periods p
-     CROSS JOIN investment_ref ir
-     LEFT JOIN transactions t ON ${txWhere}
-     GROUP BY p.period_start, p.period_end
-     ORDER BY p.period_start`,
+       period_start,
+       period_end,
+       COALESCE(SUM(GREATEST(-amount, 0)) FILTER (WHERE analytic_type = 'expense'), 0)::bigint AS expense_amount,
+       COALESCE(SUM(GREATEST(amount, 0)) FILTER (WHERE analytic_type = 'income'), 0)::bigint AS income_amount,
+       COALESCE(SUM(GREATEST(-amount, 0)) FILTER (WHERE analytic_type = 'transfer'), 0)::bigint AS transfer_outflow
+     FROM period_category_net
+     GROUP BY period_start, period_end
+     ORDER BY period_start`,
    values,
  );

@@ -328,6 +247,6 @@ export async function getTimeseries(
    periodEnd: r.period_end.toISOString().slice(0, 10),
    expenseAmount: Number(r.expense_amount),
    incomeAmount: Number(r.income_amount),
-    investmentOutflow: Number(r.investment_outflow),
+    transferOutflow: Number(r.transfer_outflow),
  }));
 }
--- a/backend/src/services/analyticsSemantics.test.ts
+++ b/backend/src/services/analyticsSemantics.test.ts
@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import { getEffectiveAmount, getNetAmount } from './analyticsSemantics';
+
+assert.equal(getNetAmount('expense', [
+  { amountSigned: -10_000, commission: 0 },
+  { amountSigned: 4_000, commission: 0 },
+]), 6_000, 'возврат уменьшает расход своей категории');
+
+assert.equal(getNetAmount('income', [
+  { amountSigned: 20_000, commission: 0 },
+  { amountSigned: -5_000, commission: 0 },
+]), 15_000, 'корректировка уменьшает доход');
+
+assert.equal(getNetAmount('transfer', [
+  { amountSigned: -10_000, commission: 0 },
+  { amountSigned: 10_000, commission: 0 },
+]), 0, 'перевод не является доходом или расходом');
+
+assert.equal(
+  getEffectiveAmount({ amountSigned: 0, commission: 500, description: 'Зачисление кэшбэка' }),
+  500,
+  'кэшбэк учитывается как поступление',
+);
+
+console.log('analytics semantics: OK');
--- a/backend/src/services/analyticsSemantics.ts
+++ b/backend/src/services/analyticsSemantics.ts
@@ -0,0 +1,32 @@
+export type AnalyticType = 'expense' | 'income' | 'transfer';
+
+interface AmountInput {
+  amountSigned: number;
+  commission: number;
+  description?: string;
+}
+
+export function getEffectiveAmount({ amountSigned, commission, description = '' }: AmountInput): number {
+  if (amountSigned === 0 && commission > 0 && description.toLowerCase().includes('зачисление')) {
+    return commission;
+  }
+  return amountSigned < 0 ? amountSigned - commission : amountSigned + commission;
+}
+
+export function getNetAmount(type: AnalyticType, amounts: AmountInput[]): number {
+  const amount = amounts.reduce((sum, item) => sum + getEffectiveAmount(item), 0);
+  if (type === 'expense') return Math.max(-amount, 0);
+  if (type === 'income') return Math.max(amount, 0);
+  return 0;
+}
+
+export function effectiveAmountCase(alias: string): string {
+  return `
+    CASE
+      WHEN ${alias}.amount_signed = 0 AND ${alias}.commission > 0
+        AND ${alias}.description ILIKE '%зачисление%'
+        THEN ${alias}.commission
+      WHEN ${alias}.amount_signed < 0 THEN ${alias}.amount_signed - ${alias}.commission
+      ELSE ${alias}.amount_signed + ${alias}.commission
+    END`;
+}
--- a/docs/backlog/analytics.md
+++ b/docs/backlog/analytics.md
@@ -37,6 +37,26 @@
 - Чистый результат (`net = totalIncome - totalExpense`).
 - Топ-3–5 категорий по расходам (сумма, доля).

+#### Нетто-правила
+
+Тип назначенной категории определяет экономический смысл операции:
+
+- `expense`: отрицательная сумма увеличивает расход, положительная сумма
+  (возврат) уменьшает его; в отчёте категория не может стать отрицательным
+  расходом;
+- `income`: положительная сумма увеличивает доход, отрицательная уменьшает
+  его;
+- `transfer`: не учитывается в реальных доходах и расходах.
+
+Если возврат не удалось определить правилом, пользователь вручную назначает
+ему ту же расходную категорию, что у исходной покупки. Отдельная категория
+«Возврат» и связывание двух операций не требуются.
+
+Для контроля остатков сводка отдельно показывает движение денежных средств:
+входящий и исходящий поток, внутренние переводы и чистое изменение денег.
+Переводы между картой, накопительными и инвестиционными счетами остаются в
+этом блоке, но не искажают доходы и расходы.
+
 Реализуется через эндпоинт `GET /api/analytics/summary`.

 Параметры:
@@ -52,6 +72,11 @@
  "totalExpense": 12345600,
  "totalIncome": 20000000,
  "net": 7654400,
+  "cashInflow": 26000000,
+  "cashOutflow": 18345600,
+  "transferInflow": 5000000,
+  "transferOutflow": 5000000,
+  "cashNet": 7654400,
  "topCategories": [
    { "categoryId": 1, "categoryName": "Продукты", "amount": 4500000, "share": 0.36 },
    { "categoryId": 2, "categoryName": "ЖКХ", "amount": 2500000, "share": 0.20 }
--- a/docs/backlog/api_import.md
+++ b/docs/backlog/api_import.md
@@ -141,6 +141,12 @@ accountNumber|operationAt|amountSigned|commission|normalizedDescription

 Список ключевых фраз для `"transfer"` может расширяться; в MVP используется фиксированный набор.

+`direction` — исходная банковская классификация. В аналитике окончательный
+экономический тип определяется типом назначенной категории: операция,
+отнесённая к расходной категории, является расходом или возвратом независимо
+от исходного `direction`; категория типа `transfer` исключает операцию из
+реальных доходов и расходов.
+
 ### Импорт транзакций

 Для каждой транзакции из массива `transactions`:
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@family-budget/frontend",
-  "version": "0.8.5",
+  "version": "0.9.0",
  "private": true,
  "type": "module",
  "scripts": {
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -10,7 +10,7 @@ export function App() {
  const { user, loading } = useAuth();

  if (loading) {
-    return <div className="app-loading">Загрузка...</div>;
+    return <div className="app-state app-state--loading">Загрузка...</div>;
  }

  if (!user) {
--- a/frontend/src/components/AccountsList.tsx
+++ b/frontend/src/components/AccountsList.tsx
@@ -36,28 +36,28 @@ export function AccountsList() {
  };

  if (loading) {
-    return <div className="section-loading">Загрузка...</div>;
+    return <div className="state state--loading">Загрузка...</div>;
  }

  return (
    <div className="settings-section">
      <table className="data-table">
-        <thead>
-          <tr>
-            <th>Банк</th>
-            <th>Номер счёта</th>
-            <th>Валюта</th>
-            <th>Алиас</th>
-            <th></th>
+        <thead className="data-table__head">
+          <tr className="data-table__row">
+            <th className="data-table__head-cell">Банк</th>
+            <th className="data-table__head-cell">Номер счёта</th>
+            <th className="data-table__head-cell">Валюта</th>
+            <th className="data-table__head-cell">Алиас</th>
+            <th className="data-table__head-cell"></th>
          </tr>
        </thead>
-        <tbody>
+        <tbody className="data-table__body">
          {accounts.map((a) => (
-            <tr key={a.id}>
-              <td>{a.bank}</td>
-              <td>{a.accountNumberMasked}</td>
-              <td>{a.currency}</td>
-              <td>
+            <tr className="data-table__row" key={a.id}>
+              <td className="data-table__cell">{a.bank}</td>
+              <td className="data-table__cell">{a.accountNumberMasked}</td>
+              <td className="data-table__cell">{a.currency}</td>
+              <td className="data-table__cell">
                {editingId === a.id ? (
                  <input
                    type="text"
@@ -72,21 +72,21 @@ export function AccountsList() {
                  />
                ) : (
                  a.alias || (
-                    <span className="text-muted">не задан</span>
+                    <span className="text text--muted">не задан</span>
                  )
                )}
              </td>
-              <td>
+              <td className="data-table__cell">
                {editingId === a.id ? (
-                  <div className="btn-group">
+                  <div className="button-group">
                    <button
-                      className="btn btn-sm btn-primary"
+                      className="button button--primary button--small"
                      onClick={() => handleSave(a.id)}
                    >
                      Сохранить
                    </button>
                    <button
-                      className="btn btn-sm btn-secondary"
+                      className="button button--secondary button--small"
                      onClick={() => setEditingId(null)}
                    >
                      Отмена
@@ -94,7 +94,7 @@ export function AccountsList() {
                  </div>
                ) : (
                  <button
-                    className="btn btn-sm btn-secondary"
+                    className="button button--secondary button--small"
                    onClick={() => handleEdit(a)}
                  >
                    Изменить
@@ -104,8 +104,8 @@ export function AccountsList() {
            </tr>
          ))}
          {accounts.length === 0 && (
-            <tr>
-              <td colSpan={5} className="td-center text-muted">
+            <tr className="data-table__row">
+              <td colSpan={5} className="data-table__cell data-table__cell--center text text--muted">
                Нет счетов. Импортируйте выписку.
              </td>
            </tr>
--- a/frontend/src/components/CategoriesList.tsx
+++ b/frontend/src/components/CategoriesList.tsx
@@ -21,24 +21,24 @@ export function CategoriesList() {
  }, []);

  if (loading) {
-    return <div className="section-loading">Загрузка...</div>;
+    return <div className="state state--loading">Загрузка...</div>;
  }

  return (
    <div className="settings-section">
      <table className="data-table">
-        <thead>
-          <tr>
-            <th>Категория</th>
-            <th>Тип</th>
+        <thead className="data-table__head">
+          <tr className="data-table__row">
+            <th className="data-table__head-cell">Категория</th>
+            <th className="data-table__head-cell">Тип</th>
          </tr>
        </thead>
-        <tbody>
+        <tbody className="data-table__body">
          {categories.map((c) => (
-            <tr key={c.id}>
-              <td>{c.name}</td>
-              <td>
-                <span className={`badge badge-${c.type}`}>
+            <tr className="data-table__row" key={c.id}>
+              <td className="data-table__cell">{c.name}</td>
+              <td className="data-table__cell">
+                <span className={`badge badge--${c.type}`}>
                  {TYPE_LABELS[c.type] ?? c.type}
                </span>
              </td>
--- a/frontend/src/components/CategoryChart.tsx
+++ b/frontend/src/components/CategoryChart.tsx
@@ -14,9 +14,14 @@ interface Props {
 }

 const COLORS = [
-  '#3b82f6', '#ef4444', '#10b981', '#f59e0b', '#8b5cf6',
-  '#ec4899', '#06b6d4', '#84cc16', '#f97316', '#6366f1',
-  '#14b8a6', '#e11d48', '#0ea5e9', '#a855f7', '#22c55e',
+  'var(--color-chart-1)', 'var(--color-chart-2)',
+  'var(--color-chart-3)', 'var(--color-chart-4)',
+  'var(--color-chart-5)', 'var(--color-chart-6)',
+  'var(--color-chart-7)', 'var(--color-chart-8)',
+  'var(--color-chart-9)', 'var(--color-chart-10)',
+  'var(--color-chart-11)', 'var(--color-chart-12)',
+  'var(--color-chart-13)', 'var(--color-chart-14)',
+  'var(--color-chart-15)',
 ];

 const rubFormatter = new Intl.NumberFormat('ru-RU', {
@@ -30,7 +35,7 @@ export function CategoryChart({ data }: Props) {
  const chartHeight = isMobile ? 250 : 300;

  if (data.length === 0) {
-    return <div className="chart-empty">Нет данных за период</div>;
+    return <div className="state state--empty">Нет данных за период</div>;
  }

  const chartData = data.map((item) => ({
@@ -41,7 +46,7 @@ export function CategoryChart({ data }: Props) {
  }));

  return (
-    <div className="category-chart-wrapper">
+    <div className="category-chart">
      <ResponsiveContainer width="100%" height={chartHeight}>
        <PieChart>
          <Pie
@@ -58,7 +63,7 @@ export function CategoryChart({ data }: Props) {
          >
            {chartData.map((_, idx) => (
              <Cell
-                key={idx}
+                key={`${idx}-${COLORS[idx % COLORS.length]}`}
                fill={COLORS[idx % COLORS.length]}
              />
            ))}
@@ -69,21 +74,21 @@ export function CategoryChart({ data }: Props) {
        </PieChart>
      </ResponsiveContainer>

-      <table className="category-table">
-        <thead>
-          <tr>
-            <th>Категория</th>
-            <th>Сумма</th>
-            <th className="th-center">Операций</th>
-            <th className="th-center">Доля</th>
+      <table className="category-chart__table">
+        <thead className="category-chart__head">
+          <tr className="category-chart__row">
+            <th className="category-chart__head-cell">Категория</th>
+            <th className="category-chart__head-cell">Сумма</th>
+            <th className="category-chart__head-cell category-chart__head-cell--center">Операций</th>
+            <th className="category-chart__head-cell category-chart__head-cell--center">Доля</th>
          </tr>
        </thead>
-        <tbody>
+        <tbody className="category-chart__body">
          {data.map((item, idx) => (
-            <tr key={item.categoryId}>
-              <td>
+            <tr className="category-chart__row" key={item.categoryId}>
+              <td className="category-chart__cell">
                <span
-                  className="color-dot"
+                  className="category-chart__dot"
                  style={{
                    backgroundColor:
                      COLORS[idx % COLORS.length],
@@ -91,9 +96,9 @@ export function CategoryChart({ data }: Props) {
                />
                {item.categoryName}
              </td>
-              <td>{formatAmount(item.amount)}</td>
-              <td className="td-center">{item.txCount}</td>
-              <td className="td-center">
+              <td className="category-chart__cell">{formatAmount(item.amount)}</td>
+              <td className="category-chart__cell category-chart__cell--center">{item.txCount}</td>
+              <td className="category-chart__cell category-chart__cell--center">
                {(item.share * 100).toFixed(1)}%
              </td>
            </tr>
--- a/frontend/src/components/ClearHistoryModal.tsx
+++ b/frontend/src/components/ClearHistoryModal.tsx
@@ -31,25 +31,30 @@ export function ClearHistoryModal({ onClose, onDone }: Props) {
  };

  return (
-    <div className="modal-overlay" onClick={onClose}>
-      <div className="modal" onClick={(e) => e.stopPropagation()}>
-        <div className="modal-header">
-          <h2>Очистить историю операций</h2>
-          <button className="btn-close" onClick={onClose}>
+    <div
+      className="modal"
+      onMouseDown={(e) => {
+        if (e.target === e.currentTarget) onClose();
+      }}
+    >
+      <div className="modal__dialog" onClick={(e) => e.stopPropagation()}>
+        <div className="modal__header">
+          <h2 className="modal__title">Очистить историю операций</h2>
+          <button className="modal__close-button" onClick={onClose} aria-label="Закрыть">
            &times;
          </button>
        </div>

-        <div className="modal-body">
-          <p className="clear-history-warn">
+        <div className="modal__body">
+          <p className="danger-note">
            Все транзакции будут безвозвратно удалены. Счета и категории
            сохранятся.
          </p>

-          {error && <div className="alert alert-error">{error}</div>}
+          {error && <div className="alert alert--error">{error}</div>}

-          <div className="form-group form-group-checkbox clear-history-check">
-            <label>
+          <div className="field field--checkbox field--flush">
+            <label className="field__label field__label--checkbox">
              <input
                type="checkbox"
                checked={check1}
@@ -59,8 +64,8 @@ export function ClearHistoryModal({ onClose, onDone }: Props) {
            </label>
          </div>

-          <div className="form-group form-group-checkbox clear-history-check">
-            <label>
+          <div className="field field--checkbox field--flush">
+            <label className="field__label field__label--checkbox">
              <input
                type="checkbox"
                checked={check2}
@@ -72,15 +77,15 @@ export function ClearHistoryModal({ onClose, onDone }: Props) {
          </div>
        </div>

-        <div className="modal-footer">
+        <div className="modal__footer">
          <button
-            className="btn btn-danger"
+            className="button button--danger modal__action"
            onClick={handleConfirm}
            disabled={!canConfirm || loading}
          >
            {loading ? 'Удаление…' : 'Удалить всё'}
          </button>
-          <button className="btn btn-secondary" onClick={onClose}>
+          <button className="button button--secondary modal__action" onClick={onClose}>
            Отмена
          </button>
        </div>
--- a/frontend/src/components/DataSection.tsx
+++ b/frontend/src/components/DataSection.tsx
@@ -34,40 +34,40 @@ export function DataSection() {

  return (
    <div className="data-section">
-      <div className="section-block">
-        <h3>История импортов</h3>
-        <p className="section-desc">
+      <div className="data-section__block">
+        <h3 className="data-section__title">История импортов</h3>
+        <p className="data-section__description">
          Список импортов выписок. Можно удалить операции конкретного импорта.
        </p>
        {imports.length === 0 ? (
-          <p className="muted">Импортов пока нет.</p>
+          <p className="text text--muted">Импортов пока нет.</p>
        ) : (
-          <div className="table-responsive">
-            <table className="table">
-              <thead>
-                <tr>
-                  <th>Дата</th>
-                  <th>Счёт</th>
-                  <th>Банк</th>
-                  <th>Импортировано</th>
-                  <th>Дубликаты</th>
-                  <th></th>
+          <div className="table-shell">
+            <table className="data-table">
+              <thead className="data-table__head">
+                <tr className="data-table__row">
+                  <th className="data-table__head-cell">Дата</th>
+                  <th className="data-table__head-cell">Счёт</th>
+                  <th className="data-table__head-cell">Банк</th>
+                  <th className="data-table__head-cell">Импортировано</th>
+                  <th className="data-table__head-cell">Дубликаты</th>
+                  <th className="data-table__head-cell"></th>
                </tr>
              </thead>
-              <tbody>
+              <tbody className="data-table__body">
                {imports.map((imp) => (
-                  <tr key={imp.id}>
-                    <td>{formatDate(imp.importedAt)}</td>
-                    <td>
+                  <tr className="data-table__row" key={imp.id}>
+                    <td className="data-table__cell">{formatDate(imp.importedAt)}</td>
+                    <td className="data-table__cell">
                      {imp.accountAlias || imp.accountNumberMasked || '—'}
                    </td>
-                    <td>{imp.bank}</td>
-                    <td>{imp.importedCount}</td>
-                    <td>{imp.duplicatesSkipped}</td>
-                    <td>
+                    <td className="data-table__cell">{imp.bank}</td>
+                    <td className="data-table__cell">{imp.importedCount}</td>
+                    <td className="data-table__cell">{imp.duplicatesSkipped}</td>
+                    <td className="data-table__cell">
                      <button
                        type="button"
-                        className="btn btn-sm btn-danger"
+                        className="button button--danger button--small"
                        onClick={() => setImpToDelete(imp)}
                        disabled={imp.importedCount === 0}
                      >
@@ -82,15 +82,15 @@ export function DataSection() {
        )}
      </div>

-      <div className="section-block">
-        <h3>Очистка данных</h3>
-        <p className="section-desc">
+      <div className="data-section__block">
+        <h3 className="data-section__title">Очистка данных</h3>
+        <p className="data-section__description">
          Очистить историю операций (все транзакции). Счета, категории и
          правила сохранятся.
        </p>
        <button
          type="button"
-          className="btn btn-danger"
+          className="button button--danger"
          onClick={() => setShowClearModal(true)}
        >
          Очистить историю
--- a/frontend/src/components/DeleteImportModal.tsx
+++ b/frontend/src/components/DeleteImportModal.tsx
@@ -31,36 +31,41 @@ export function DeleteImportModal({ imp, onClose, onDone }: Props) {
  };

  return (
-    <div className="modal-overlay" onClick={onClose}>
-      <div className="modal" onClick={(e) => e.stopPropagation()}>
-        <div className="modal-header">
-          <h2>Удалить импорт</h2>
-          <button className="btn-close" onClick={onClose}>
+    <div
+      className="modal"
+      onMouseDown={(e) => {
+        if (e.target === e.currentTarget) onClose();
+      }}
+    >
+      <div className="modal__dialog" onClick={(e) => e.stopPropagation()}>
+        <div className="modal__header">
+          <h2 className="modal__title">Удалить импорт</h2>
+          <button className="modal__close-button" onClick={onClose} aria-label="Закрыть">
            &times;
          </button>
        </div>

-        <div className="modal-body">
-          <p className="clear-history-warn">
+        <div className="modal__body">
+          <p className="danger-note">
            Будут удалены все операции этого импорта ({imp.importedCount}{' '}
            шт.): {imp.bank} / {accountLabel}
          </p>

-          {error && <div className="alert alert-error">{error}</div>}
+          {error && <div className="alert alert--error">{error}</div>}

          <p>Действие необратимо.</p>
        </div>

-        <div className="modal-footer">
+        <div className="modal__footer">
          <button
            type="button"
-            className="btn btn-danger"
+            className="button button--danger modal__action"
            onClick={handleConfirm}
            disabled={loading}
          >
            {loading ? 'Удаление…' : 'Удалить'}
          </button>
-          <button type="button" className="btn btn-secondary" onClick={onClose}>
+          <button type="button" className="button button--secondary modal__action" onClick={onClose}>
            Отмена
          </button>
        </div>
--- a/frontend/src/components/EditTransactionModal.tsx
+++ b/frontend/src/components/EditTransactionModal.tsx
@@ -82,44 +82,49 @@ export function EditTransactionModal({
  };

  return (
-    <div className="modal-overlay" onClick={onClose}>
-      <div className="modal" onClick={(e) => e.stopPropagation()}>
-        <div className="modal-header">
-          <h2>Редактирование операции</h2>
-          <button className="btn-close" onClick={onClose}>
+    <div
+      className="modal"
+      onMouseDown={(e) => {
+        if (e.target === e.currentTarget) onClose();
+      }}
+    >
+      <div className="modal__dialog" onClick={(e) => e.stopPropagation()}>
+        <div className="modal__header">
+          <h2 className="modal__title">Редактирование операции</h2>
+          <button className="modal__close-button" onClick={onClose} aria-label="Закрыть">
            &times;
          </button>
        </div>

-        <form onSubmit={handleSubmit}>
-          <div className="modal-body">
-            {error && <div className="alert alert-error">{error}</div>}
+        <form className="form" onSubmit={handleSubmit}>
+          <div className="modal__body">
+            {error && <div className="alert alert--error">{error}</div>}

-            <div className="modal-tx-info">
-              <div className="modal-tx-row">
-                <span className="modal-tx-label">Дата</span>
+            <div className="transaction-preview">
+              <div className="transaction-preview__row">
+                <span className="transaction-preview__label">Дата</span>
                <span>{formatDateTime(transaction.operationAt)}</span>
              </div>
-              <div className="modal-tx-row">
-                <span className="modal-tx-label">Сумма</span>
+              <div className="transaction-preview__row">
+                <span className="transaction-preview__label">Сумма</span>
                <span>{formatAmount(transaction.amountSigned)}</span>
              </div>
              {transaction.commission !== 0 && (
-                <div className="modal-tx-row">
-                  <span className="modal-tx-label">Комиссия</span>
+                <div className="transaction-preview__row">
+                  <span className="transaction-preview__label">Комиссия</span>
                  <span>{formatAmount(getCommissionAmountSigned(transaction))}</span>
                </div>
              )}
-              <div className="modal-tx-row">
-                <span className="modal-tx-label">Описание</span>
-                <span className="modal-tx-description">
+              <div className="transaction-preview__row">
+                <span className="transaction-preview__label">Описание</span>
+                <span className="transaction-preview__description">
                  {transaction.description}
                </span>
              </div>
            </div>

-            <div className="form-group">
-              <label htmlFor="edit-category">Категория</label>
+            <div className="field">
+              <label className="field__label" htmlFor="edit-category">Категория</label>
              <select
                id="edit-category"
                value={categoryId}
@@ -134,8 +139,8 @@ export function EditTransactionModal({
              </select>
            </div>

-            <div className="form-group">
-              <label htmlFor="edit-comment">Комментарий</label>
+            <div className="field">
+              <label className="field__label" htmlFor="edit-comment">Комментарий</label>
              <textarea
                id="edit-comment"
                rows={2}
@@ -145,10 +150,10 @@ export function EditTransactionModal({
              />
            </div>

-            <div className="form-divider" />
+            <div className="form__divider" />

-            <div className="form-group form-group-checkbox">
-              <label>
+            <div className="field field--checkbox">
+              <label className="field__label field__label--checkbox">
                <input
                  type="checkbox"
                  checked={createRule}
@@ -160,8 +165,8 @@ export function EditTransactionModal({

            {createRule && (
              <>
-                <div className="form-group">
-                  <label htmlFor="edit-pattern">
+                <div className="field">
+                  <label className="field__label" htmlFor="edit-pattern">
                    Шаблон (ключевая строка)
                  </label>
                  <input
@@ -172,8 +177,8 @@ export function EditTransactionModal({
                    maxLength={200}
                  />
                </div>
-                <div className="form-group form-group-checkbox">
-                  <label>
+                <div className="field field--checkbox">
+                  <label className="field__label field__label--checkbox">
                    <input
                      type="checkbox"
                      checked={requiresConfirmation}
@@ -188,17 +193,17 @@ export function EditTransactionModal({
            )}
          </div>

-          <div className="modal-footer">
+          <div className="modal__footer">
            <button
              type="button"
-              className="btn btn-secondary"
+              className="button button--secondary modal__action"
              onClick={onClose}
            >
              Отмена
            </button>
            <button
              type="submit"
-              className="btn btn-primary"
+              className="button button--primary modal__action"
              disabled={saving}
            >
              {saving ? 'Сохранение...' : 'Сохранить'}
--- a/frontend/src/components/ImportModal.tsx
+++ b/frontend/src/components/ImportModal.tsx
@@ -59,67 +59,74 @@ export function ImportModal({ onClose, onDone }: Props) {
  };

  return (
-    <div className="modal-overlay" onClick={onClose}>
-      <div className="modal" onClick={(e) => e.stopPropagation()}>
-        <div className="modal-header">
-          <h2>Импорт выписки</h2>
-          <button className="btn-close" onClick={onClose}>
+    <div
+      className="modal"
+      onMouseDown={(e) => {
+        if (e.target === e.currentTarget) onClose();
+      }}
+    >
+      <div className="modal__dialog" onClick={(e) => e.stopPropagation()}>
+        <div className="modal__header">
+          <h2 className="modal__title">Импорт выписки</h2>
+          <button className="modal__close-button" onClick={onClose} aria-label="Закрыть">
            &times;
          </button>
        </div>

-        <div className="modal-body">
-          {error && <div className="alert alert-error">{error}</div>}
+        <div className="modal__body">
+          {error && <div className="alert alert--error">{error}</div>}

          {!result && (
            <div className="import-upload">
-              <p>Выберите файл выписки (PDF или JSON, формат 1.0)</p>
+              <p className="import-upload__description">
+                Выберите файл выписки (PDF или JSON, формат 1.0)
+              </p>
              <input
                ref={fileRef}
                type="file"
                accept=".pdf,.json,application/pdf,application/json"
                onChange={handleFileChange}
-                className="file-input"
+                className="import-upload__input"
              />
              {loading && (
-                <div className="import-loading">Импорт...</div>
+                <div className="import-upload__loading">Импорт...</div>
              )}
            </div>
          )}

          {result && (
            <div className="import-result">
-              <div className="import-result-icon" aria-hidden="true">✓</div>
-              <h3>Импорт завершён</h3>
-              <table className="import-stats">
-                <tbody>
-                  <tr>
-                    <td>Счёт</td>
-                    <td>{result.accountNumberMasked}</td>
+              <div className="import-result__icon" aria-hidden="true">✓</div>
+              <h3 className="import-result__title">Импорт завершён</h3>
+              <table className="import-result__stats">
+                <tbody className="import-result__stats-body">
+                  <tr className="import-result__stat-row">
+                    <td className="import-result__stat-cell import-result__stat-cell--label">Счёт</td>
+                    <td className="import-result__stat-cell import-result__stat-cell--value">{result.accountNumberMasked}</td>
                  </tr>
-                  <tr>
-                    <td>Новый счёт</td>
-                    <td>{result.isNewAccount ? 'Да' : 'Нет'}</td>
+                  <tr className="import-result__stat-row">
+                    <td className="import-result__stat-cell import-result__stat-cell--label">Новый счёт</td>
+                    <td className="import-result__stat-cell import-result__stat-cell--value">{result.isNewAccount ? 'Да' : 'Нет'}</td>
                  </tr>
-                  <tr>
-                    <td>Импортировано</td>
-                    <td>{result.imported}</td>
+                  <tr className="import-result__stat-row">
+                    <td className="import-result__stat-cell import-result__stat-cell--label">Импортировано</td>
+                    <td className="import-result__stat-cell import-result__stat-cell--value">{result.imported}</td>
                  </tr>
-                  <tr>
-                    <td>Дубликатов пропущено</td>
-                    <td>{result.duplicatesSkipped}</td>
+                  <tr className="import-result__stat-row">
+                    <td className="import-result__stat-cell import-result__stat-cell--label">Дубликатов пропущено</td>
+                    <td className="import-result__stat-cell import-result__stat-cell--value">{result.duplicatesSkipped}</td>
                  </tr>
-                  <tr>
-                    <td>Всего в файле</td>
-                    <td>{result.totalInFile}</td>
+                  <tr className="import-result__stat-row">
+                    <td className="import-result__stat-cell import-result__stat-cell--label">Всего в файле</td>
+                    <td className="import-result__stat-cell import-result__stat-cell--value">{result.totalInFile}</td>
                  </tr>
                </tbody>
              </table>

              {result.isNewAccount && !aliasSaved && (
-                <div className="import-alias">
-                  <label>Алиас для нового счёта</label>
-                  <div className="import-alias-row">
+                <div className="import-result__alias">
+                  <label className="import-result__alias-label">Алиас для нового счёта</label>
+                  <div className="import-result__alias-row">
                    <input
                      type="text"
                      placeholder="Напр.: Текущий, Накопительный"
@@ -128,7 +135,7 @@ export function ImportModal({ onClose, onDone }: Props) {
                      maxLength={50}
                    />
                    <button
-                      className="btn btn-sm btn-primary"
+                      className="button button--primary button--small"
                      onClick={handleSaveAlias}
                      disabled={!alias.trim()}
                    >
@@ -139,7 +146,7 @@ export function ImportModal({ onClose, onDone }: Props) {
              )}

              {aliasSaved && (
-                <div className="import-alias-saved">
+                <div className="import-result__alias-saved">
                  Алиас сохранён
                </div>
              )}
@@ -147,14 +154,14 @@ export function ImportModal({ onClose, onDone }: Props) {
          )}
        </div>

-        <div className="modal-footer">
+        <div className="modal__footer">
          {result ? (
-            <button className="btn btn-primary" onClick={onDone}>
+            <button className="button button--primary modal__action" onClick={onDone}>
              Готово
            </button>
          ) : (
            <button
-              className="btn btn-secondary"
+              className="button button--secondary modal__action"
              onClick={onClose}
              disabled={loading}
            >
--- a/frontend/src/components/Layout.tsx
+++ b/frontend/src/components/Layout.tsx
@@ -17,10 +17,10 @@ export function Layout({ children }: { children: ReactNode }) {
  }, []);

  return (
-    <div className="layout">
+    <div className="app-shell">
      <button
        type="button"
-        className="burger-btn"
+        className="menu-button"
        aria-label="Открыть меню"
        onClick={() => setDrawerOpen(true)}
      >
@@ -33,27 +33,27 @@ export function Layout({ children }: { children: ReactNode }) {

      {drawerOpen && (
        <div
-          className="sidebar-overlay"
+          className="app-shell__overlay"
          aria-hidden="true"
          onClick={closeDrawer}
        />
      )}

-      <aside className={`sidebar ${drawerOpen ? 'sidebar-open' : ''}`}>
-        <div className="sidebar-brand">
-          <span className="sidebar-brand-icon">₽</span>
-          <span className="sidebar-brand-text">Семейный бюджет</span>
+      <aside className={`sidebar ${drawerOpen ? 'sidebar--open' : ''}`}>
+        <div className="sidebar__brand">
+          <span className="sidebar__brand-icon">₽</span>
+          <span className="sidebar__brand-text">Семейный бюджет</span>
        </div>

-        <nav className="sidebar-nav">
+        <nav className="sidebar__nav" aria-label="Основная навигация">
          <NavLink
            to="/history"
            className={({ isActive }) =>
-              `nav-link${isActive ? ' active' : ''}`
+              `sidebar__nav-link${isActive ? ' sidebar__nav-link--active' : ''}`
            }
            onClick={closeDrawer}
          >
-            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+            <svg className="sidebar__nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
              <path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z" />
              <polyline points="14,2 14,8 20,8" />
              <line x1="16" y1="13" x2="8" y2="13" />
@@ -66,11 +66,11 @@ export function Layout({ children }: { children: ReactNode }) {
          <NavLink
            to="/analytics"
            className={({ isActive }) =>
-              `nav-link${isActive ? ' active' : ''}`
+              `sidebar__nav-link${isActive ? ' sidebar__nav-link--active' : ''}`
            }
            onClick={closeDrawer}
          >
-            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+            <svg className="sidebar__nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
              <line x1="18" y1="20" x2="18" y2="10" />
              <line x1="12" y1="20" x2="12" y2="4" />
              <line x1="6" y1="20" x2="6" y2="14" />
@@ -81,11 +81,11 @@ export function Layout({ children }: { children: ReactNode }) {
          <NavLink
            to="/settings"
            className={({ isActive }) =>
-              `nav-link${isActive ? ' active' : ''}`
+              `sidebar__nav-link${isActive ? ' sidebar__nav-link--active' : ''}`
            }
            onClick={closeDrawer}
          >
-            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+            <svg className="sidebar__nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
              <circle cx="12" cy="12" r="3" />
              <path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 010 2.83 2 2 0 01-2.83 0l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83 0 2 2 0 010-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 010-2.83 2 2 0 012.83 0l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 0 2 2 0 010 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z" />
            </svg>
@@ -93,23 +93,23 @@ export function Layout({ children }: { children: ReactNode }) {
          </NavLink>
        </nav>

-        <div className="sidebar-footer">
-          <div className="sidebar-footer-top">
-            <span className="sidebar-user">{user?.login}</span>
-            <button className="btn-logout" onClick={() => logout()}>
+        <div className="sidebar__footer">
+          <div className="sidebar__user-row">
+            <span className="sidebar__user">{user?.login}</span>
+            <button className="sidebar__logout" onClick={() => logout()}>
              Выход
            </button>
          </div>
-          <div className="sidebar-footer-bottom">
-            <span className="sidebar-version">
+          <div className="sidebar__meta">
+            <span className="sidebar__version">
              FE {__FE_VERSION__} · BE {beVersion ?? '…'}
            </span>
-            <span className="sidebar-copyright">© 2025 Семейный бюджет</span>
+            <span className="sidebar__copyright">© 2025 Семейный бюджет</span>
          </div>
        </div>
      </aside>

-      <main className="main-content">{children}</main>
+      <main className="app-shell__main">{children}</main>
    </div>
  );
 }
--- a/frontend/src/components/Pagination.tsx
+++ b/frontend/src/components/Pagination.tsx
@@ -20,35 +20,38 @@ export function Pagination({

  return (
    <div className="pagination">
-      <div className="pagination-info">
+      <div className="pagination__info">
        {totalItems > 0
          ? `Показано ${from}–${to} из ${totalItems}`
          : 'Нет записей'}
      </div>
-      <div className="pagination-controls">
+      <div className="pagination__controls">
        <select
-          className="pagination-size"
+          className="pagination__size"
          value={pageSize}
          onChange={(e) => onPageSizeChange(Number(e.target.value))}
+          aria-label="Количество операций на странице"
        >
          <option value={10}>10</option>
          <option value={50}>50</option>
          <option value={100}>100</option>
        </select>
        <button
-          className="btn-page"
+          className="icon-button"
          disabled={page <= 1}
          onClick={() => onPageChange(page - 1)}
+          aria-label="Предыдущая страница"
        >
          &larr;
        </button>
-        <span className="pagination-current">
+        <span className="pagination__current">
          {page} / {totalPages || 1}
        </span>
        <button
-          className="btn-page"
+          className="icon-button"
          disabled={page >= totalPages}
          onClick={() => onPageChange(page + 1)}
+          aria-label="Следующая страница"
        >
          &rarr;
        </button>
--- a/frontend/src/components/PeriodSelector.tsx
+++ b/frontend/src/components/PeriodSelector.tsx
@@ -85,13 +85,13 @@ export function PeriodSelector({ period, onChange }: Props) {
  };

  return (
-    <div className="period-selector">
-      <div className="period-modes">
+    <div className="period-picker">
+      <div className="segmented-control">
        {(['week', 'month', 'year', 'custom'] as PeriodMode[]).map(
          (m) => (
            <button
              key={m}
-              className={`btn-preset ${period.mode === m ? 'active' : ''}`}
+              className={`segmented-control__button ${period.mode === m ? 'segmented-control__button--active' : ''}`}
              onClick={() => setMode(m)}
            >
              {MODE_LABELS[m]}
@@ -100,13 +100,18 @@ export function PeriodSelector({ period, onChange }: Props) {
        )}
      </div>

-      <div className="period-nav">
+      <div className="period-picker__nav">
        {period.mode !== 'custom' && (
-          <button className="btn-page" onClick={() => navigate(-1)}>
+          <button
+            className="icon-button"
+            onClick={() => navigate(-1)}
+            aria-label="Предыдущий период"
+            title="Предыдущий период"
+          >
            &larr;
          </button>
        )}
-        <div className="period-dates">
+        <div className="period-picker__dates">
          <input
            type="date"
            value={period.from}
@@ -114,7 +119,7 @@ export function PeriodSelector({ period, onChange }: Props) {
              onChange({ ...period, mode: 'custom', from: e.target.value })
            }
          />
-          <span className="filter-separator">&mdash;</span>
+          <span className="period-picker__separator">&mdash;</span>
          <input
            type="date"
            value={period.to}
@@ -124,7 +129,12 @@ export function PeriodSelector({ period, onChange }: Props) {
          />
        </div>
        {period.mode !== 'custom' && (
-          <button className="btn-page" onClick={() => navigate(1)}>
+          <button
+            className="icon-button"
+            onClick={() => navigate(1)}
+            aria-label="Следующий период"
+            title="Следующий период"
+          >
            &rarr;
          </button>
        )}
--- a/frontend/src/components/RulesList.tsx
+++ b/frontend/src/components/RulesList.tsx
@@ -51,56 +51,59 @@ export function RulesList() {
  };

  if (loading) {
-    return <div className="section-loading">Загрузка...</div>;
+    return <div className="state state--loading">Загрузка...</div>;
  }

  return (
-    <div className="settings-section">
+    <div className="rules-list settings-section">
      <table className="data-table">
-        <thead>
-          <tr>
-            <th>Шаблон</th>
-            <th>Категория</th>
-            <th className="th-center">Приоритет</th>
-            <th className="th-center">Подтверждение</th>
-            <th>Создано</th>
-            <th className="th-center">Активно</th>
-            <th></th>
+        <thead className="data-table__head">
+          <tr className="data-table__row">
+            <th className="data-table__head-cell">Шаблон</th>
+            <th className="data-table__head-cell">Категория</th>
+            <th className="data-table__head-cell data-table__head-cell--center">Приоритет</th>
+            <th className="data-table__head-cell data-table__head-cell--center">Подтверждение</th>
+            <th className="data-table__head-cell">Создано</th>
+            <th className="data-table__head-cell data-table__head-cell--center">Активно</th>
+            <th className="data-table__head-cell"></th>
          </tr>
        </thead>
-        <tbody>
+        <tbody className="data-table__body">
          {rules.map((r) => (
            <tr
              key={r.id}
-              className={!r.isActive ? 'row-inactive' : ''}
+              className={`data-table__row ${!r.isActive ? 'data-table__row--inactive' : ''}`}
            >
-              <td>
+              <td className="data-table__cell">
                <code>{r.pattern}</code>
              </td>
-              <td>{r.categoryName}</td>
-              <td className="td-center">{r.priority}</td>
-              <td className="td-center">
+              <td className="data-table__cell">{r.categoryName}</td>
+              <td className="data-table__cell data-table__cell--center">{r.priority}</td>
+              <td className="data-table__cell data-table__cell--center">
                {r.requiresConfirmation ? 'Да' : 'Нет'}
              </td>
-              <td className="td-nowrap">
+              <td className="data-table__cell data-table__cell--nowrap">
                {formatDate(r.createdAt)}
              </td>
-              <td className="td-center">
+              <td className="data-table__cell data-table__cell--center">
                <button
-                  className={`toggle ${r.isActive ? 'toggle-on' : 'toggle-off'}`}
+                  className={`switch-button ${r.isActive ? 'switch-button--on' : 'switch-button--off'}`}
                  onClick={() => handleToggle(r)}
                  title={
                    r.isActive ? 'Деактивировать' : 'Активировать'
                  }
+                  aria-label={
+                    r.isActive ? 'Деактивировать правило' : 'Активировать правило'
+                  }
                >
                  {r.isActive ? 'Вкл' : 'Выкл'}
                </button>
              </td>
-              <td>
-                <div className="rules-actions">
+              <td className="data-table__cell">
+                <div className="rules-list__actions">
                  {r.isActive && (
                    <button
-                      className="btn btn-sm btn-secondary"
+                      className="button button--secondary button--small"
                      onClick={() => handleApply(r.id)}
                      disabled={applyingId === r.id}
                    >
@@ -108,7 +111,7 @@ export function RulesList() {
                    </button>
                  )}
                  {applyResult?.id === r.id && (
-                    <span className="apply-result">
+                    <span className="rules-list__result">
                      Применено: {applyResult.count}
                    </span>
                  )}
@@ -117,8 +120,8 @@ export function RulesList() {
            </tr>
          ))}
          {rules.length === 0 && (
-            <tr>
-              <td colSpan={7} className="td-center text-muted">
+            <tr className="data-table__row">
+              <td colSpan={7} className="data-table__cell data-table__cell--center text text--muted">
                Нет правил
              </td>
            </tr>
--- a/frontend/src/components/SummaryCards.tsx
+++ b/frontend/src/components/SummaryCards.tsx
@@ -6,59 +6,63 @@ interface Props {
 }

 export function SummaryCards({ summary }: Props) {
+  const balanceModifier = summary.net >= 0 ? 'positive' : 'negative';
+
  return (
-    <div className="summary-cards">
-      <div className="summary-card summary-card-income">
-        <div className="summary-label">Доходы</div>
-        <div className="summary-value">
+    <div className="summary">
+      <div className="summary__card summary__card--income">
+        <div className="summary__label">Доходы</div>
+        <div className="summary__value">
          {formatAmount(summary.totalIncome)}
        </div>
      </div>

-      <div className="summary-card summary-card-expense">
-        <div className="summary-label">Расходы</div>
-        <div className="summary-value">
+      <div className="summary__card summary__card--expense">
+        <div className="summary__label">Расходы</div>
+        <div className="summary__value">
          {formatAmount(summary.totalExpense)}
        </div>
      </div>

      <div
-        className={`summary-card ${summary.net >= 0 ? 'summary-card-positive' : 'summary-card-negative'}`}
+        className={`summary__card summary__card--${balanceModifier}`}
      >
-        <div className="summary-label">Баланс</div>
-        <div className="summary-value">
+        <div className="summary__label">Баланс</div>
+        <div className="summary__value">
          {formatAmount(summary.net)}
        </div>
      </div>

-      <div className="summary-card summary-card-investments">
-        <div className="summary-label">На инвестиции</div>
-        <div className="summary-value">
-          {formatAmount(summary.investmentOutflow)}
+      <div className="summary__card summary__card--investments">
+        <div className="summary__label">Движение ДС</div>
+        <div className="summary__value">
+          {formatAmount(summary.cashNet)}
        </div>
-        {summary.investmentIncomeExcluded > 0 && (
-          <div className="summary-subvalue">
-            Исключено из доходов: {formatAmount(summary.investmentIncomeExcluded)}
+        <div className="summary__subvalue">Поступило: {formatAmount(summary.cashInflow)}</div>
+        <div className="summary__subvalue">Списано: {formatAmount(summary.cashOutflow)}</div>
+        {(summary.transferInflow > 0 || summary.transferOutflow > 0) && (
+          <div className="summary__subvalue">
+            Переводы: {formatAmount(summary.transferInflow)} / {formatAmount(summary.transferOutflow)}
          </div>
        )}
      </div>

      {summary.topCategories.length > 0 && (
-        <div className="summary-card summary-card-top">
-          <div className="summary-label">Топ расходов</div>
-          <div className="summary-top-list">
+        <div className="summary__card summary__card--top">
+          <div className="summary__label">Топ расходов</div>
+          <div className="summary__top-list">
            {summary.topCategories.map((cat) => (
              <div
                key={cat.categoryId}
-                className="top-category-item"
+                className="summary__top-item"
              >
-                <span className="top-category-name">
+                <span className="summary__top-name">
                  {cat.categoryName}
                </span>
-                <span className="top-category-amount">
+                <span className="summary__top-amount">
                  {formatAmount(cat.amount)}
                </span>
-                <span className="top-category-share">
+                <span className="summary__top-share">
                  {(cat.share * 100).toFixed(0)}%
                </span>
              </div>
--- a/frontend/src/components/TimeseriesChart.tsx
+++ b/frontend/src/components/TimeseriesChart.tsx
@@ -26,20 +26,20 @@ export function TimeseriesChart({ data }: Props) {
  const chartHeight = isMobile ? 250 : 300;

  if (data.length === 0) {
-    return <div className="chart-empty">Нет данных за период</div>;
+    return <div className="state state--empty">Нет данных за период</div>;
  }

  const chartData = data.map((item) => ({
    period: item.periodStart,
    Расходы: Math.abs(item.expenseAmount) / 100,
    Доходы: item.incomeAmount / 100,
-    Инвестиции: Math.abs(item.investmentOutflow) / 100,
+    Переводы: item.transferOutflow / 100,
  }));

  return (
    <ResponsiveContainer width="100%" height={chartHeight}>
      <BarChart data={chartData}>
-        <CartesianGrid strokeDasharray="3 3" stroke="#e2e8f0" />
+        <CartesianGrid strokeDasharray="3 3" stroke="var(--color-border)" vertical={false} />
        <XAxis
          dataKey="period"
          tickFormatter={(v: string) => {
@@ -47,32 +47,42 @@ export function TimeseriesChart({ data }: Props) {
            return `${d.getDate()}.${String(d.getMonth() + 1).padStart(2, '0')}`;
          }}
          fontSize={12}
-          stroke="#64748b"
+          stroke="var(--color-text-secondary)"
+          tickLine={false}
+          axisLine={false}
        />
        <YAxis
          tickFormatter={(v: number) =>
            v >= 1000 ? `${(v / 1000).toFixed(0)}к` : String(v)
          }
          fontSize={12}
-          stroke="#64748b"
+          stroke="var(--color-text-secondary)"
+          tickLine={false}
+          axisLine={false}
        />
        <Tooltip
          formatter={(value: number) => rubFormatter.format(value)}
+          cursor={{ fill: 'var(--color-chart-cursor)' }}
+          contentStyle={{
+            border: '1px solid var(--color-border)',
+            borderRadius: 8,
+            boxShadow: 'var(--shadow-lg)',
+          }}
        />
        <Legend />
        <Bar
          dataKey="Расходы"
-          fill="#ef4444"
+          fill="var(--color-danger)"
          radius={[4, 4, 0, 0]}
        />
        <Bar
          dataKey="Доходы"
-          fill="#10b981"
+          fill="var(--color-success)"
          radius={[4, 4, 0, 0]}
        />
        <Bar
-          dataKey="Инвестиции"
-          fill="#f59e0b"
+          dataKey="Переводы"
+          fill="var(--color-warning)"
          radius={[4, 4, 0, 0]}
        />
      </BarChart>
--- a/frontend/src/components/TransactionFilters.tsx
+++ b/frontend/src/components/TransactionFilters.tsx
@@ -115,28 +115,29 @@ export function TransactionFilters({
  };

  return (
-    <div className="filters-panel">
-      <div className="filters-row">
-        <div className="filter-group">
-          <label>Период</label>
-          <div className="filter-dates-wrap">
+    <div className="filters">
+      <div className="filters__row">
+        <div className="field field--period">
+          <label className="field__label">Период</label>
+          <div className="filters__date-control">
            {filters.periodMode !== 'custom' && (
              <button
                type="button"
-                className="btn-page"
+                className="icon-button"
                onClick={() => navigate(-1)}
+                aria-label="Предыдущий период"
                title="Предыдущий период"
              >
                &larr;
              </button>
            )}
-            <div className="filter-dates">
+            <div className="filters__dates">
              <input
                type="date"
                value={filters.from}
                onChange={(e) => handleDateChange('from', e.target.value)}
              />
-              <span className="filter-separator">&mdash;</span>
+              <span className="filters__separator">&mdash;</span>
              <input
                type="date"
                value={filters.to}
@@ -146,29 +147,30 @@ export function TransactionFilters({
            {filters.periodMode !== 'custom' && (
              <button
                type="button"
-                className="btn-page"
+                className="icon-button"
                onClick={() => navigate(1)}
+                aria-label="Следующий период"
                title="Следующий период"
              >
                &rarr;
              </button>
            )}
          </div>
-          <div className="filter-presets">
+          <div className="segmented-control segmented-control--compact">
            <button
-              className={`btn-preset ${filters.periodMode === 'week' ? 'active' : ''}`}
+              className={`segmented-control__button ${filters.periodMode === 'week' ? 'segmented-control__button--active' : ''}`}
              onClick={() => applyPreset('week')}
            >
              Неделя
            </button>
            <button
-              className={`btn-preset ${filters.periodMode === 'month' ? 'active' : ''}`}
+              className={`segmented-control__button ${filters.periodMode === 'month' ? 'segmented-control__button--active' : ''}`}
              onClick={() => applyPreset('month')}
            >
              Месяц
            </button>
            <button
-              className={`btn-preset ${filters.periodMode === 'year' ? 'active' : ''}`}
+              className={`segmented-control__button ${filters.periodMode === 'year' ? 'segmented-control__button--active' : ''}`}
              onClick={() => applyPreset('year')}
            >
              Год
@@ -176,8 +178,8 @@ export function TransactionFilters({
          </div>
        </div>

-        <div className="filter-group">
-          <label>Счёт</label>
+        <div className="field">
+          <label className="field__label">Счёт</label>
          <select
            value={filters.accountId}
            onChange={(e) => set('accountId', e.target.value)}
@@ -191,8 +193,8 @@ export function TransactionFilters({
          </select>
        </div>

-        <div className="filter-group">
-          <label>Тип</label>
+        <div className="field">
+          <label className="field__label">Тип</label>
          <select
            value={filters.direction}
            onChange={(e) => set('direction', e.target.value)}
@@ -204,8 +206,8 @@ export function TransactionFilters({
          </select>
        </div>

-        <div className="filter-group">
-          <label>Категория</label>
+        <div className="field">
+          <label className="field__label">Категория</label>
          <select
            value={filters.categoryId}
            onChange={(e) => set('categoryId', e.target.value)}
@@ -220,9 +222,9 @@ export function TransactionFilters({
        </div>
      </div>

-      <div className="filters-row">
-        <div className="filter-group filter-group-wide">
-          <label>Поиск</label>
+      <div className="filters__row">
+        <div className="field field--wide">
+          <label className="field__label">Поиск</label>
          <input
            type="text"
            placeholder="Поиск по описанию..."
@@ -231,8 +233,8 @@ export function TransactionFilters({
          />
        </div>

-        <div className="filter-group">
-          <label>Сумма от (₽)</label>
+        <div className="field">
+          <label className="field__label">Сумма от (₽)</label>
          <input
            type="number"
            placeholder="мин"
@@ -241,8 +243,8 @@ export function TransactionFilters({
          />
        </div>

-        <div className="filter-group">
-          <label>Сумма до (₽)</label>
+        <div className="field">
+          <label className="field__label">Сумма до (₽)</label>
          <input
            type="number"
            placeholder="макс"
@@ -251,8 +253,8 @@ export function TransactionFilters({
          />
        </div>

-        <div className="filter-group filter-group-checkbox">
-          <label>
+        <div className="field field--checkbox">
+          <label className="field__label field__label--checkbox">
            <input
              type="checkbox"
              checked={filters.onlyUnconfirmed}
@@ -262,9 +264,9 @@ export function TransactionFilters({
          </label>
        </div>

-        <div className="filter-group">
-          <label>Сортировка</label>
-          <div className="filter-sort">
+        <div className="field">
+          <label className="field__label">Сортировка</label>
+          <div className="filters__sort">
            <select
              value={filters.sortBy}
              onChange={(e) =>
@@ -275,7 +277,7 @@ export function TransactionFilters({
              <option value="amount">По сумме</option>
            </select>
            <button
-              className="btn-sort-order"
+              className="icon-button"
              onClick={() =>
                set(
                  'sortOrder',
@@ -287,6 +289,11 @@ export function TransactionFilters({
                  ? 'По возрастанию'
                  : 'По убыванию'
              }
+              aria-label={
+                filters.sortOrder === 'asc'
+                  ? 'Сортировать по убыванию'
+                  : 'Сортировать по возрастанию'
+              }
            >
              {filters.sortOrder === 'asc' ? '↑' : '↓'}
            </button>
--- a/frontend/src/components/TransactionTable.tsx
+++ b/frontend/src/components/TransactionTable.tsx
@@ -8,9 +8,9 @@ interface Props {
 }

 const DIRECTION_CLASSES: Record<string, string> = {
-  income: 'amount-income',
-  expense: 'amount-expense',
-  transfer: 'amount-transfer',
+  income: 'money-amount--income',
+  expense: 'money-amount--expense',
+  transfer: 'money-amount--transfer',
 };

 function getCommissionAmountSigned(tx: Transaction): number {
@@ -33,39 +33,39 @@ function TransactionCard({

  return (
    <div
-      className={`transaction-card ${isUnconfirmed ? 'row-unconfirmed' : ''}`}
+      className={`transaction-card ${isUnconfirmed ? 'transaction-card--unconfirmed' : ''}`}
    >
-      <div className="transaction-card-header">
-        <span className="transaction-card-date">
+      <div className="transaction-card__header">
+        <span className="transaction-card__date">
          {formatDateTime(tx.operationAt)}
        </span>
-        <span className={`transaction-card-amount ${directionClass}`}>
+        <span className={`money-amount transaction-card__amount ${directionClass}`}>
          {formatAmount(tx.amountSigned)}
        </span>
      </div>
      {tx.commission !== 0 && (
-        <div className="transaction-card-commission">
+        <div className="transaction-card__commission">
          Комиссия: {formatAmount(getCommissionAmountSigned(tx))}
        </div>
      )}
-      <div className="transaction-card-body">
-        <span className="description-text">{tx.description}</span>
+      <div className="transaction-card__body">
+        <span className="transaction-card__description">{tx.description}</span>
        {tx.comment && (
-          <span className="comment-badge" title={tx.comment}>
+          <span className="comment-indicator" title={tx.comment}>
            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
              <path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z" />
            </svg>
          </span>
        )}
      </div>
-      <div className="transaction-card-footer">
-        <span className="transaction-card-meta">
+      <div className="transaction-card__footer">
+        <span className="transaction-card__meta">
          {tx.accountAlias || '—'} · {tx.categoryName || '—'}
        </span>
-        <div className="transaction-card-actions">
+        <div className="transaction-card__actions">
          {tx.categoryId != null && !tx.isCategoryConfirmed && (
            <span
-              className="badge badge-warning"
+              className="badge badge--warning"
              title="Категория не подтверждена"
            >
              ?
@@ -73,8 +73,9 @@ function TransactionCard({
          )}
          <button
            type="button"
-            className="btn-icon btn-icon-touch"
+            className="icon-button icon-button--touch"
            onClick={() => onEdit(tx)}
+            aria-label="Редактировать операцию"
            title="Редактировать"
          >
            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
@@ -90,81 +91,82 @@ function TransactionCard({

 export function TransactionTable({ transactions, loading, onEdit }: Props) {
  if (loading) {
-    return <div className="table-loading">Загрузка операций...</div>;
+    return <div className="state state--loading">Загрузка операций...</div>;
  }

  if (transactions.length === 0) {
-    return <div className="table-empty">Операции не найдены</div>;
+    return <div className="state state--empty">Операции не найдены</div>;
  }

  return (
    <>
-      <div className="table-wrapper table-desktop">
+      <div className="table-shell table-shell--desktop">
        <table className="data-table">
-          <thead>
-            <tr>
-              <th>Дата</th>
-              <th>Счёт</th>
-              <th>Сумма</th>
-              <th>Описание</th>
-              <th>Категория</th>
-              <th className="th-center">Статус</th>
-              <th></th>
+          <thead className="data-table__head">
+            <tr className="data-table__row">
+              <th className="data-table__head-cell">Дата</th>
+              <th className="data-table__head-cell">Счёт</th>
+              <th className="data-table__head-cell">Сумма</th>
+              <th className="data-table__head-cell">Описание</th>
+              <th className="data-table__head-cell">Категория</th>
+              <th className="data-table__head-cell data-table__head-cell--center">Статус</th>
+              <th className="data-table__head-cell"></th>
            </tr>
          </thead>
-          <tbody>
+          <tbody className="data-table__body">
            {transactions.map((tx) => (
              <tr
                key={tx.id}
                className={
                  !tx.isCategoryConfirmed && tx.categoryId
-                    ? 'row-unconfirmed'
-                    : ''
+                    ? 'data-table__row data-table__row--unconfirmed'
+                    : 'data-table__row'
                }
              >
-                <td className="td-nowrap">
+                <td className="data-table__cell data-table__cell--nowrap">
                  {formatDateTime(tx.operationAt)}
                </td>
-                <td className="td-nowrap">{tx.accountAlias || '—'}</td>
+                <td className="data-table__cell data-table__cell--nowrap">{tx.accountAlias || '—'}</td>
                <td
-                  className={`td-nowrap td-amount ${DIRECTION_CLASSES[tx.direction] ?? ''}`}
+                  className={`data-table__cell data-table__cell--nowrap money-amount ${DIRECTION_CLASSES[tx.direction] ?? ''}`}
                >
                  <div>{formatAmount(tx.amountSigned)}</div>
                  {tx.commission !== 0 && (
-                    <div className="td-commission">
+                    <div className="data-table__subtext">
                      Комиссия: {formatAmount(getCommissionAmountSigned(tx))}
                    </div>
                  )}
                </td>
-                <td className="td-description">
-                  <span className="description-text">{tx.description}</span>
+                <td className="data-table__cell data-table__cell--description">
+                  <span className="data-table__description">{tx.description}</span>
                  {tx.comment && (
-                    <span className="comment-badge" title={tx.comment}>
+                    <span className="comment-indicator" title={tx.comment}>
                      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
                        <path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z" />
                      </svg>
                    </span>
                  )}
                </td>
-                <td className="td-nowrap">
+                <td className="data-table__cell data-table__cell--nowrap">
                  {tx.categoryName || (
-                    <span className="text-muted">—</span>
+                    <span className="text text--muted">—</span>
                  )}
                </td>
-                <td className="td-center">
+                <td className="data-table__cell data-table__cell--center">
                  {tx.categoryId != null && !tx.isCategoryConfirmed && (
                    <span
-                      className="badge badge-warning"
+                      className="badge badge--warning"
                      title="Категория не подтверждена"
                    >
                      ?
                    </span>
                  )}
                </td>
-                <td>
+                <td className="data-table__cell">
                  <button
-                    className="btn-icon"
+                    className="icon-button"
                    onClick={() => onEdit(tx)}
+                    aria-label="Редактировать операцию"
                    title="Редактировать"
                  >
                    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
@@ -179,7 +181,7 @@ export function TransactionTable({ transactions, loading, onEdit }: Props) {
        </table>
      </div>

-      <div className="transaction-cards transaction-mobile">
+      <div className="transaction-list transaction-list--mobile">
        {transactions.map((tx) => (
          <TransactionCard key={tx.id} tx={tx} onEdit={onEdit} />
        ))}
--- a/frontend/src/pages/AnalyticsPage.tsx
+++ b/frontend/src/pages/AnalyticsPage.tsx
@@ -88,15 +88,18 @@ export function AnalyticsPage() {

  return (
    <div className="page">
-      <div className="page-header">
-        <h1>Аналитика</h1>
+      <div className="page__header">
+        <div>
+          <p className="page__eyebrow">Обзор периода</p>
+          <h1 className="page__title">Аналитика</h1>
+        </div>
      </div>

-      <div className="analytics-controls">
+      <div className="analytics-panel">
        <PeriodSelector period={period} onChange={setPeriod} />
-        <div className="analytics-filters">
-          <div className="filter-group">
-            <label>Счёт</label>
+        <div className="analytics-panel__filters">
+          <div className="field">
+            <label className="field__label">Счёт</label>
            <select
              value={accountId}
              onChange={(e) => setAccountId(e.target.value)}
@@ -109,8 +112,8 @@ export function AnalyticsPage() {
              ))}
            </select>
          </div>
-          <div className="filter-group filter-group-checkbox">
-            <label>
+          <div className="field field--checkbox">
+            <label className="field__label field__label--checkbox">
              <input
                type="checkbox"
                checked={onlyConfirmed}
@@ -123,17 +126,17 @@ export function AnalyticsPage() {
      </div>

      {loading ? (
-        <div className="section-loading">Загрузка данных...</div>
+        <div className="state state--loading">Загрузка данных...</div>
      ) : (
        <>
          {summary && <SummaryCards summary={summary} />}
-          <div className="analytics-charts">
+          <div className="analytics-grid">
            <div className="chart-card">
-              <h3>Динамика</h3>
+              <h3 className="chart-card__title">Динамика</h3>
              <TimeseriesChart data={timeseries} />
            </div>
            <div className="chart-card">
-              <h3>По категориям</h3>
+              <h3 className="chart-card__title">По категориям</h3>
              <CategoryChart data={byCategory} />
            </div>
          </div>
--- a/frontend/src/pages/HistoryPage.tsx
+++ b/frontend/src/pages/HistoryPage.tsx
@@ -204,12 +204,20 @@ export function HistoryPage() {

  return (
    <div className="page">
-      <div className="page-header">
-        <h1>История операций</h1>
+      <div className="page__header">
+        <div>
+          <p className="page__eyebrow">Операции</p>
+          <h1 className="page__title">История операций</h1>
+        </div>
        <button
-          className="btn btn-primary"
+          className="button button--primary page__action"
          onClick={() => setShowImport(true)}
        >
+          <svg className="button__icon" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+            <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+            <polyline points="7,10 12,15 17,10" />
+            <line x1="12" y1="15" x2="12" y2="3" />
+          </svg>
          Импорт выписки
        </button>
      </div>
--- a/frontend/src/pages/LoginPage.tsx
+++ b/frontend/src/pages/LoginPage.tsx
@@ -20,17 +20,17 @@ export function LoginPage() {
  };

  return (
-    <div className="login-page">
-      <div className="login-card">
-        <div className="login-header">
-          <span className="login-icon">₽</span>
-          <h1>Семейный бюджет</h1>
-          <p>Войдите для продолжения</p>
+    <div className="login">
+      <div className="login__panel">
+        <div className="login__header">
+          <span className="login__icon">₽</span>
+          <h1 className="login__title">Семейный бюджет</h1>
+          <p className="login__subtitle">Войдите для продолжения</p>
        </div>
-        <form onSubmit={handleSubmit} className="login-form">
-          {error && <div className="alert alert-error">{error}</div>}
-          <div className="form-group">
-            <label htmlFor="login">Логин</label>
+        <form onSubmit={handleSubmit} className="form login__form">
+          {error && <div className="alert alert--error">{error}</div>}
+          <div className="field">
+            <label className="field__label" htmlFor="login">Логин</label>
            <input
              id="login"
              type="text"
@@ -41,8 +41,8 @@ export function LoginPage() {
              autoFocus
            />
          </div>
-          <div className="form-group">
-            <label htmlFor="password">Пароль</label>
+          <div className="field">
+            <label className="field__label" htmlFor="password">Пароль</label>
            <input
              id="password"
              type="password"
@@ -54,7 +54,7 @@ export function LoginPage() {
          </div>
          <button
            type="submit"
-            className="btn btn-primary btn-block"
+            className="button button--primary button--block"
            disabled={submitting}
          >
            {submitting ? 'Вход...' : 'Войти'}
--- a/frontend/src/pages/SettingsPage.tsx
+++ b/frontend/src/pages/SettingsPage.tsx
@@ -11,38 +11,41 @@ export function SettingsPage() {

  return (
    <div className="page">
-      <div className="page-header">
-        <h1>Настройки</h1>
+      <div className="page__header">
+        <div>
+          <p className="page__eyebrow">Справочники</p>
+          <h1 className="page__title">Настройки</h1>
+        </div>
      </div>

      <div className="tabs">
        <button
-          className={`tab ${tab === 'accounts' ? 'active' : ''}`}
+          className={`tabs__button ${tab === 'accounts' ? 'tabs__button--active' : ''}`}
          onClick={() => setTab('accounts')}
        >
          Счета
        </button>
        <button
-          className={`tab ${tab === 'categories' ? 'active' : ''}`}
+          className={`tabs__button ${tab === 'categories' ? 'tabs__button--active' : ''}`}
          onClick={() => setTab('categories')}
        >
          Категории
        </button>
        <button
-          className={`tab ${tab === 'rules' ? 'active' : ''}`}
+          className={`tabs__button ${tab === 'rules' ? 'tabs__button--active' : ''}`}
          onClick={() => setTab('rules')}
        >
          Правила
        </button>
        <button
-          className={`tab ${tab === 'data' ? 'active' : ''}`}
+          className={`tabs__button ${tab === 'data' ? 'tabs__button--active' : ''}`}
          onClick={() => setTab('data')}
        >
          Данные
        </button>
      </div>

-      <div className="tab-content">
+      <div className="tabs__content">
        {tab === 'accounts' && <AccountsList />}
        {tab === 'categories' && <CategoriesList />}
        {tab === 'rules' && <RulesList />}
--- a/frontend/src/styles/index.css
+++ b/frontend/src/styles/index.css
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
    },
    "frontend": {
      "name": "@family-budget/frontend",
-      "version": "0.1.0",
+      "version": "0.9.0",
      "dependencies": {
        "@family-budget/shared": "*",
        "react": "^19.0.0",
--- a/shared/package.json
+++ b/shared/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@family-budget/shared",
-  "version": "0.1.1",
+  "version": "0.2.0",
  "private": true,
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
--- a/shared/src/types/analytics.ts
+++ b/shared/src/types/analytics.ts
@@ -18,8 +18,11 @@ export interface AnalyticsSummaryResponse {
  totalExpense: number;
  totalIncome: number;
  net: number;
-  investmentOutflow: number;
-  investmentIncomeExcluded: number;
+  cashInflow: number;
+  cashOutflow: number;
+  transferInflow: number;
+  transferOutflow: number;
+  cashNet: number;
  topCategories: TopCategory[];
 }

@@ -52,5 +55,5 @@ export interface TimeseriesItem {
  periodEnd: string;
  expenseAmount: number;
  incomeAmount: number;
-  investmentOutflow: number;
+  transferOutflow: number;
 }
Author	SHA1	Message	Date
admin	36562f8d78	docs: update analytics changelog	2026-08-19 09:14:57 +03:00
admin	1cbef453b0	test(analytics): verify SQL aggregates	2026-08-19 09:12:43 +03:00
admin	019714a8cf	test(analytics): cover net category semantics	2026-08-19 07:49:54 +03:00
admin	a79629a60d	feat(analytics): add net cashflow reporting	2026-08-18 23:09:40 +03:00
admin	ea70be8e5a	Merge pull request 'refactor(frontend): complete BEM design system' (#20 ) from agent/family_budget:refactor/complete-bem-design-system into main Reviewed-on: #20	2026-08-16 06:29:58 +00:00
admin	2c98d9c534	docs: add frontend 0.8.7 changelog	2026-08-16 09:19:46 +03:00
admin	2422ca44b0	refactor(frontend): complete BEM design system	2026-08-14 23:58:14 +03:00
admin	6610e43200	Merge pull request 'feat(frontend): refresh UI with warm fintech redesign' (#19 ) from feature/redesign into main Reviewed-on: #19	2026-04-22 08:41:37 +00:00
Anton	ec62a0591e	feat(frontend): refresh UI with warm fintech redesign	2026-04-22 11:40:15 +03:00
admin	97b61de092	Merge pull request 'fix: close modal popups only on overlay mousedown' (#18 ) from fix/modal-mousedown-overlay-close into main Reviewed-on: #18	2026-04-15 14:02:52 +00:00
Anton	0e0186fdbb	fix: close modal popups only on overlay mousedown	2026-04-15 17:02:15 +03:00
admin	02ca34d088	Merge pull request 'feat(analytics): account commission and investment transfers' (#17 ) from feat/commission-analytics-investments into main Reviewed-on: #17	2026-04-15 11:32:56 +00:00