diff --git a/VERSION b/VERSION index 595ad53..43b5827 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.16.3 +4.17.0 diff --git a/play-life-web/package.json b/play-life-web/package.json index 023fa8f..44fa5c3 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "4.16.3", + "version": "4.17.0", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/Wishlist.css b/play-life-web/src/components/Wishlist.css index 57ba4c5..dfafce4 100644 --- a/play-life-web/src/components/Wishlist.css +++ b/play-life-web/src/components/Wishlist.css @@ -274,7 +274,8 @@ font-size: 1.25rem; color: #2c3e50; display: -webkit-box; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; + line-clamp: 1; -webkit-box-orient: vertical; overflow: hidden; line-height: 1.3; @@ -375,6 +376,12 @@ color: #2c3e50; font-size: 1.75rem; text-align: center; + display: -webkit-box; + -webkit-line-clamp: 1; + line-clamp: 1; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } .wishlist-modal-actions { diff --git a/play-life-web/src/components/Wishlist.jsx b/play-life-web/src/components/Wishlist.jsx index e3b6988..ee0e996 100644 --- a/play-life-web/src/components/Wishlist.jsx +++ b/play-life-web/src/components/Wishlist.jsx @@ -554,16 +554,13 @@ function Wishlist({ onNavigate, refreshTrigger = 0, isActive = false, initialBoa if (condition.type === 'task_completion') { conditionText = condition.task_name || 'Задача' } else { - const points = condition.required_points || 0 + const requiredPoints = condition.required_points || 0 + const currentPoints = condition.current_points || 0 + const remainingPoints = Math.max(0, requiredPoints - currentPoints) const project = condition.project_name || 'Проект' - let dateText = '' - if (condition.start_date) { - const date = new Date(condition.start_date + 'T00:00:00') - dateText = ` с ${date.toLocaleDateString('ru-RU')}` - } else { - dateText = ' за всё время' - } - conditionText = `${points} в ${project}${dateText}` + // Показываем оставшиеся баллы в формате "33 в Привлекательность" + // Дата начала отсчёта уже учтена в current_points на бэкенде + conditionText = `${Math.round(remainingPoints)} в ${project}` } return ( diff --git a/play-life-web/src/components/WishlistDetail.css b/play-life-web/src/components/WishlistDetail.css index 611ebf7..bfd4377 100644 --- a/play-life-web/src/components/WishlistDetail.css +++ b/play-life-web/src/components/WishlistDetail.css @@ -39,10 +39,14 @@ margin: 0; flex: 1; min-width: 0; - word-wrap: break-word; - word-break: break-word; transition: opacity 0.2s; line-height: 1.5; + display: -webkit-box; + -webkit-line-clamp: 1; + line-clamp: 1; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } .wishlist-detail-title:hover {