6.19.2: Фикс кнопки сохранения в приоритетах
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m18s
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m18s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "play-life-web",
|
"name": "play-life-web",
|
||||||
"version": "6.19.1",
|
"version": "6.19.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -1167,8 +1167,6 @@ function AppContent() {
|
|||||||
let paddingClasses = ''
|
let paddingClasses = ''
|
||||||
if (tabName === 'current' || tabName === 'tasks' || tabName === 'wishlist' || tabName === 'profile') {
|
if (tabName === 'current' || tabName === 'tasks' || tabName === 'wishlist' || tabName === 'profile') {
|
||||||
paddingClasses = 'pb-20'
|
paddingClasses = 'pb-20'
|
||||||
} else if (tabName === 'priorities') {
|
|
||||||
paddingClasses = 'pb-20'
|
|
||||||
} else if (tabName === 'words' || tabName === 'dictionaries' || tabName === 'shopping') {
|
} else if (tabName === 'words' || tabName === 'dictionaries' || tabName === 'shopping') {
|
||||||
paddingClasses = 'pb-16'
|
paddingClasses = 'pb-16'
|
||||||
}
|
}
|
||||||
@@ -1184,7 +1182,10 @@ function AppContent() {
|
|||||||
if (tabName === 'current') {
|
if (tabName === 'current') {
|
||||||
return 'max-w-7xl mx-auto p-4 md:p-6'
|
return 'max-w-7xl mx-auto p-4 md:p-6'
|
||||||
}
|
}
|
||||||
if (tabName === 'full' || tabName === 'priorities' || tabName === 'dictionaries' || tabName === 'words' || tabName === 'shopping' || tabName === 'shopping-item-history' || tabName === 'purchase') {
|
if (tabName === 'priorities') {
|
||||||
|
return 'max-w-2xl mx-auto px-4 h-full'
|
||||||
|
}
|
||||||
|
if (tabName === 'full' || tabName === 'dictionaries' || tabName === 'words' || tabName === 'shopping' || tabName === 'shopping-item-history' || tabName === 'purchase') {
|
||||||
return 'max-w-7xl mx-auto px-4 md:px-8 py-0'
|
return 'max-w-7xl mx-auto px-4 md:px-8 py-0'
|
||||||
}
|
}
|
||||||
// Fullscreen табы без отступов
|
// Fullscreen табы без отступов
|
||||||
|
|||||||
@@ -629,7 +629,6 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
if (onConfirmed) onConfirmed()
|
if (onConfirmed) onConfirmed()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setToastMessage({ text: e.message || 'Ошибка сохранения', type: 'error' })
|
setToastMessage({ text: e.message || 'Ошибка сохранения', type: 'error' })
|
||||||
} finally {
|
|
||||||
setIsSaving(false)
|
setIsSaving(false)
|
||||||
}
|
}
|
||||||
}, [authFetch, buildAssignments, onConfirmed])
|
}, [authFetch, buildAssignments, onConfirmed])
|
||||||
@@ -1061,7 +1060,7 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div style={{
|
{!(projectsLoading && !maxPriority.length && !mediumPriority.length && !lowPriority.length) && <div style={{
|
||||||
position: 'sticky',
|
position: 'sticky',
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
left: 0,
|
left: 0,
|
||||||
@@ -1093,7 +1092,7 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
|
|||||||
>
|
>
|
||||||
{isSaving ? 'Сохранение...' : 'Сохранить'}
|
{isSaving ? 'Сохранение...' : 'Сохранить'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>}
|
||||||
|
|
||||||
{toastMessage && (
|
{toastMessage && (
|
||||||
<Toast
|
<Toast
|
||||||
|
|||||||
Reference in New Issue
Block a user