4.17.0: Остаток баллов, одна строка заголовка
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "play-life-web",
|
"name": "play-life-web",
|
||||||
"version": "4.16.3",
|
"version": "4.17.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -274,7 +274,8 @@
|
|||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
color: #2c3e50;
|
color: #2c3e50;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 1;
|
||||||
|
line-clamp: 1;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
line-height: 1.3;
|
line-height: 1.3;
|
||||||
@@ -375,6 +376,12 @@
|
|||||||
color: #2c3e50;
|
color: #2c3e50;
|
||||||
font-size: 1.75rem;
|
font-size: 1.75rem;
|
||||||
text-align: center;
|
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 {
|
.wishlist-modal-actions {
|
||||||
|
|||||||
@@ -554,16 +554,13 @@ function Wishlist({ onNavigate, refreshTrigger = 0, isActive = false, initialBoa
|
|||||||
if (condition.type === 'task_completion') {
|
if (condition.type === 'task_completion') {
|
||||||
conditionText = condition.task_name || 'Задача'
|
conditionText = condition.task_name || 'Задача'
|
||||||
} else {
|
} 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 || 'Проект'
|
const project = condition.project_name || 'Проект'
|
||||||
let dateText = ''
|
// Показываем оставшиеся баллы в формате "33 в Привлекательность"
|
||||||
if (condition.start_date) {
|
// Дата начала отсчёта уже учтена в current_points на бэкенде
|
||||||
const date = new Date(condition.start_date + 'T00:00:00')
|
conditionText = `${Math.round(remainingPoints)} в ${project}`
|
||||||
dateText = ` с ${date.toLocaleDateString('ru-RU')}`
|
|
||||||
} else {
|
|
||||||
dateText = ' за всё время'
|
|
||||||
}
|
|
||||||
conditionText = `${points} в ${project}${dateText}`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -39,10 +39,14 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
word-wrap: break-word;
|
|
||||||
word-break: break-word;
|
|
||||||
transition: opacity 0.2s;
|
transition: opacity 0.2s;
|
||||||
line-height: 1.5;
|
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 {
|
.wishlist-detail-title:hover {
|
||||||
|
|||||||
Reference in New Issue
Block a user