From 08f81887b04736381bb2d8f5f2b95e924b63970c Mon Sep 17 00:00:00 2001 From: poignatov Date: Sun, 11 Jan 2026 15:32:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BD=D0=B8=D1=84=D0=B8=D1=86=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=D1=85=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Добавлен единый стиль загрузки с лоадером и текстом 'Загрузка...' - Центрирование по вертикали с учетом наличия табов - Обновлены все 10 экранов: CurrentWeek, TestConfigSelection, TaskList, FullStatistics, WordList, TaskForm, TestWords, TodoistIntegration, TelegramIntegration, ProjectPriorityManager - Версия: 3.8.8 --- VERSION | 2 +- play-life-web/package.json | 2 +- play-life-web/src/components/CurrentWeek.jsx | 4 ++-- play-life-web/src/components/FullStatistics.jsx | 4 ++-- play-life-web/src/components/ProjectPriorityManager.jsx | 7 +++++-- play-life-web/src/components/TaskForm.jsx | 7 ++++++- play-life-web/src/components/TaskList.jsx | 7 ++++++- play-life-web/src/components/TelegramIntegration.jsx | 7 +++++-- play-life-web/src/components/TestConfigSelection.jsx | 7 ++++++- play-life-web/src/components/TestWords.jsx | 7 ++++++- play-life-web/src/components/TodoistIntegration.jsx | 7 ++++++- play-life-web/src/components/WordList.jsx | 7 ++++++- 12 files changed, 52 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index 4351a7e..d7d8e42 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.7 +3.8.8 diff --git a/play-life-web/package.json b/play-life-web/package.json index a6b90f0..2320fef 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "3.8.7", + "version": "3.8.8", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/CurrentWeek.jsx b/play-life-web/src/components/CurrentWeek.jsx index 87578d9..c1a5d89 100644 --- a/play-life-web/src/components/CurrentWeek.jsx +++ b/play-life-web/src/components/CurrentWeek.jsx @@ -8,10 +8,10 @@ function CurrentWeek({ onProjectClick, data, loading, error, onRetry, allProject // Показываем loading только если данных нет и идет загрузка if (loading && (!data || projectsData.length === 0)) { return ( -
+
-
Загрузка данных...
+
Загрузка...
) diff --git a/play-life-web/src/components/FullStatistics.jsx b/play-life-web/src/components/FullStatistics.jsx index c78ff9e..439507a 100644 --- a/play-life-web/src/components/FullStatistics.jsx +++ b/play-life-web/src/components/FullStatistics.jsx @@ -119,10 +119,10 @@ function FullStatistics({ selectedProject, onClearSelection, data, loading, erro // Показываем loading только если данных нет и идет загрузка if (loading && !chartData) { return ( -
+
-
Загрузка данных...
+
Загрузка...
) diff --git a/play-life-web/src/components/ProjectPriorityManager.jsx b/play-life-web/src/components/ProjectPriorityManager.jsx index 72fae57..d865da8 100644 --- a/play-life-web/src/components/ProjectPriorityManager.jsx +++ b/play-life-web/src/components/ProjectPriorityManager.jsx @@ -891,8 +891,11 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad, )} {projectsLoading && (!maxPriority.length && !mediumPriority.length && !lowPriority.length) ? ( -
- Загружаем проекты... +
+
+
+
Загрузка...
+
) : ( -
Загрузка...
+
+
+
+
Загрузка...
+
+
) } diff --git a/play-life-web/src/components/TaskList.jsx b/play-life-web/src/components/TaskList.jsx index 90bd125..2516fcf 100644 --- a/play-life-web/src/components/TaskList.jsx +++ b/play-life-web/src/components/TaskList.jsx @@ -640,7 +640,12 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, onRefresh }) { if (loading && !backgroundLoading && !hasData) { return (
-
Загрузка...
+
+
+
+
Загрузка...
+
+
) } diff --git a/play-life-web/src/components/TelegramIntegration.jsx b/play-life-web/src/components/TelegramIntegration.jsx index 63591d6..124dc42 100644 --- a/play-life-web/src/components/TelegramIntegration.jsx +++ b/play-life-web/src/components/TelegramIntegration.jsx @@ -41,8 +41,11 @@ function TelegramIntegration({ onNavigate }) { if (loading) { return ( -
-
Загрузка...
+
+
+
+
Загрузка...
+
) } diff --git a/play-life-web/src/components/TestConfigSelection.jsx b/play-life-web/src/components/TestConfigSelection.jsx index 91579a2..6510e60 100644 --- a/play-life-web/src/components/TestConfigSelection.jsx +++ b/play-life-web/src/components/TestConfigSelection.jsx @@ -154,7 +154,12 @@ function TestConfigSelection({ onNavigate, refreshTrigger = 0 }) { if (shouldShowLoading) { return (
-
Загрузка...
+
+
+
+
Загрузка...
+
+
) } diff --git a/play-life-web/src/components/TestWords.jsx b/play-life-web/src/components/TestWords.jsx index 4ed04d0..51e079a 100644 --- a/play-life-web/src/components/TestWords.jsx +++ b/play-life-web/src/components/TestWords.jsx @@ -617,7 +617,12 @@ function TestWords({ onNavigate, wordCount: initialWordCount, configId: initialC ) : (
{loading && ( -
Загрузка слов...
+
+
+
+
Загрузка...
+
+
)} {error && (
{error}
diff --git a/play-life-web/src/components/TodoistIntegration.jsx b/play-life-web/src/components/TodoistIntegration.jsx index d40f906..9234feb 100644 --- a/play-life-web/src/components/TodoistIntegration.jsx +++ b/play-life-web/src/components/TodoistIntegration.jsx @@ -121,7 +121,12 @@ function TodoistIntegration({ onNavigate }) { )} {loading ? ( -
Загрузка...
+
+
+
+
Загрузка...
+
+
) : connected ? (
diff --git a/play-life-web/src/components/WordList.jsx b/play-life-web/src/components/WordList.jsx index e4e284d..2aa2b9a 100644 --- a/play-life-web/src/components/WordList.jsx +++ b/play-life-web/src/components/WordList.jsx @@ -163,7 +163,12 @@ function WordList({ onNavigate, dictionaryId, isNewDictionary, refreshTrigger = if (loading) { return (
-
Загрузка...
+
+
+
+
Загрузка...
+
+
) }