sasheg/dodep-simulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Переписал уведомления: toast/confirm вместо alert; объединил профиль+инвентарь; починил ленту активности

Browse Source
This commit is contained in:
root
2026-07-05 15:05:04 +00:00
parent fe6bf5cf29
commit 50535ec777
15 changed files with 1523 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend.py
+41 -61
View File
@@ -348,7 +348,7 @@ async def profile_page(
inventory_items = db.query(InventoryItem).filter(
InventoryItem.user_id == user.id
).all()
).order_by(desc(InventoryItem.obtained_at)).all()
valuable_items = sorted(
inventory_items,
@@ -356,15 +356,52 @@ async def profile_page(
reverse=True
)[:12]
rarities = set()
types = set()
enriched_items = []
for item in inventory_items:
item_data = None
for idx, it in enumerate(ALL_ITEMS):
if it.get("_id", idx) == item.item_id:
item_data = it
break
if not item_data:
item_data = get_item(item.item_id)
image_url = ""
price_rub = 100
if item_data:
image_url = item_data.get("image_url", "")
price_rub = item_data.get("price_rub", 100)
enriched_items.append({
"id": item.id,
"item_id": item.item_id,
"name": item.market_hash_name,
"rarity": item.rarity,
"wear": item.wear,
"float": item.float_value,
"type": item.type,
"image_url": image_url,
"price_rub": price_rub
})
if item.rarity:
rarities.add(item.rarity)
if item.type:
types.add(item.type)
return templates.TemplateResponse("profile.html", {
"request": request,
"user": user,
"total_items": total_items,
"cases_opened": cases_opened,
"contracts_completed": contracts_completed,
"balance": user.balance,
"recent_openings": recent_openings,
"recent_contracts": recent_contracts,
"valuable_items": valuable_items,
"inventory_items": enriched_items,
"rarities": sorted(rarities),
"types": sorted(types),
"rarity_order": RARITY_ORDER,
"is_public": False,
"profile_user": user
})
@@ -564,66 +601,9 @@ async def contracts_page(
"knife_count": len(knife_items)
})
@app.get("/inventory", response_class=HTMLResponse)
async def inventory_page(
request: Request,
db: Session = Depends(get_db),
user: User = Depends(get_current_user)
):
inventory_items = db.query(InventoryItem).filter(
InventoryItem.user_id == user.id
).order_by(desc(InventoryItem.obtained_at)).all()
rarities = set()
types = set()
enriched_items = []
for item in inventory_items:
# Ищем предмет по item_id
item_data = None
for idx, it in enumerate(ALL_ITEMS):
if it.get("_id", idx) == item.item_id:
item_data = it
break
# Если не нашли, пробуем get_item
if not item_data:
item_data = get_item(item.item_id)
image_url = ""
price_rub = 100
if item_data:
image_url = item_data.get("image_url", "")
price_rub = item_data.get("price_rub", 100)
enriched_items.append({
"id": item.id,
"item_id": item.item_id,
"name": item.market_hash_name,
"rarity": item.rarity,
"wear": item.wear,
"float": item.float_value,
"type": item.type,
"obtained_from": item.obtained_from,
"obtained_at": item.obtained_at,
"image_url": image_url,
"price_rub": price_rub
})
if item.rarity:
rarities.add(item.rarity)
if item.type:
types.add(item.type)
return templates.TemplateResponse("inventory.html", {
"request": request,
"user": user,
"inventory_items": enriched_items,
"rarities": sorted(rarities),
"types": sorted(types),
"rarity_order": RARITY_ORDER
})
@app.get("/inventory")
async def inventory_redirect():
return RedirectResponse(url="/profile")
# ─── API эндпоинты для веб-интерфейса ─────────────────────────────────────
static/css/style.css
+214
View File
@@ -4487,3 +4487,217 @@ a:not(.btn):not(.nav-link):not(.logo) {
a:not(.btn):not(.nav-link):not(.logo):hover {
border-bottom-color: var(--primary-color);
}
/* =============================================
🍞 Уведомления (Toast + Confirm)
============================================= */
.toast-container {
position: fixed;
top: 72px;
right: 16px;
z-index: 9999;
display: flex;
flex-direction: column;
gap: 8px;
pointer-events: none;
max-width: 380px;
width: 100%;
}
.toast {
background: var(--bg-elevated);
border: 1px solid var(--border-light);
border-radius: 10px;
padding: 12px 16px;
display: flex;
align-items: flex-start;
gap: 10px;
pointer-events: auto;
box-shadow: 0 8px 32px rgba(0,0,0,0.5);
animation: toastSlideIn 0.3s cubic-bezier(0.16, 1, 0.3, 1);
transform-origin: top right;
position: relative;
overflow: hidden;
}
.toast::before {
content: '';
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 3px;
border-radius: 3px 0 0 3px;
}
.toast-success::before { background: var(--success); }
.toast-error::before { background: var(--danger); }
.toast-info::before { background: var(--primary); }
.toast-warning::before { background: var(--warning); }
.toast-icon {
width: 24px;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
border-radius: 6px;
font-size: 0.85rem;
}
.toast-success .toast-icon { background: rgba(16,185,129,0.15); }
.toast-error .toast-icon { background: rgba(239,68,68,0.15); }
.toast-info .toast-icon { background: rgba(245,158,11,0.15); }
.toast-warning .toast-icon { background: rgba(245,158,11,0.15); }
.toast-content {
flex: 1;
min-width: 0;
}
.toast-title {
font-size: 0.82rem;
font-weight: 600;
color: var(--text);
line-height: 1.3;
}
.toast-message {
font-size: 0.75rem;
color: var(--text-dim);
margin-top: 2px;
line-height: 1.3;
}
.toast-close {
width: 20px;
height: 20px;
display: flex;
align-items: center;
justify-content: center;
background: none;
border: none;
color: var(--text-muted);
cursor: pointer;
font-size: 0.75rem;
flex-shrink: 0;
border-radius: 4px;
transition: all 0.15s;
}
.toast-close:hover {
background: rgba(255,255,255,0.06);
color: var(--text);
}
.toast-removing {
animation: toastSlideOut 0.25s cubic-bezier(0.4, 0, 1, 1) forwards;
}
@keyframes toastSlideIn {
from { opacity: 0; transform: translateX(100%) scale(0.9); }
to { opacity: 1; transform: translateX(0) scale(1); }
}
@keyframes toastSlideOut {
from { opacity: 1; transform: translateX(0) scale(1); }
to { opacity: 0; transform: translateX(100%) scale(0.9); }
}
/* =============================================
⚠️ Confirm диалог
============================================= */
.confirm-overlay {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.7);
backdrop-filter: blur(4px);
-webkit-backdrop-filter: blur(4px);
display: flex;
align-items: center;
justify-content: center;
z-index: 10000;
animation: confirmFadeIn 0.2s ease;
}
.confirm-dialog {
background: var(--bg-card);
border: 1px solid var(--border-light);
border-radius: 14px;
padding: 24px;
max-width: 400px;
width: 90%;
animation: confirmScaleIn 0.25s cubic-bezier(0.16, 1, 0.3, 1);
box-shadow: 0 24px 80px rgba(0,0,0,0.6);
}
.confirm-dialog-header {
display: flex;
align-items: center;
gap: 10px;
margin-bottom: 12px;
}
.confirm-dialog-icon {
width: 36px;
height: 36px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 10px;
font-size: 1.1rem;
flex-shrink: 0;
}
.confirm-dialog-icon-warning { background: rgba(239,68,68,0.15); }
.confirm-dialog-icon-info { background: rgba(245,158,11,0.15); }
.confirm-dialog-title {
font-size: 1rem;
font-weight: 600;
color: var(--text);
}
.confirm-dialog-message {
font-size: 0.88rem;
color: var(--text-dim);
line-height: 1.5;
margin-bottom: 20px;
padding-left: 46px;
}
.confirm-dialog-actions {
display: flex;
gap: 10px;
justify-content: flex-end;
}
.confirm-dialog-actions .btn {
min-width: 90px;
padding: 0.55rem 1.2rem;
font-size: 0.8rem;
}
.confirm-dialog .btn-danger {
background: var(--danger);
color: white;
border: none;
}
.confirm-dialog .btn-danger:hover {
background: #dc2626;
box-shadow: 0 4px 16px rgba(239,68,68,0.3);
}
@keyframes confirmFadeIn {
from { opacity: 0; }
to { opacity: 1; }
}
@keyframes confirmScaleIn {
from { opacity: 0; transform: scale(0.9) translateY(10px); }
to { opacity: 1; transform: scale(1) translateY(0); }
}
static/js/notifications.js
+137
View File
@@ -0,0 +1,137 @@
(function() {
'use strict';
let toastId = 0;
const container = document.createElement('div');
container.className = 'toast-container';
container.id = 'toastContainer';
document.body.appendChild(container);
function escapeHtml(text) {
const d = document.createElement('div');
d.textContent = text || '';
return d.innerHTML;
}
window.Notify = {
toast: function(message, type, title) {
if (!message) return;
type = type || 'info';
const icons = { success: '✓', error: '✕', info: 'ℹ', warning: '⚠' };
const titles = { success: title || 'Успешно', error: title || 'Ошибка', info: title || 'Информация', warning: title || 'Внимание' };
const icon = icons[type] || 'ℹ';
const t = titles[type];
const id = ++toastId;
const el = document.createElement('div');
el.className = 'toast toast-' + type;
el.id = 'toast-' + id;
el.innerHTML =
'<div class="toast-icon">' + icon + '</div>' +
'<div class="toast-content">' +
'<div class="toast-title">' + escapeHtml(t) + '</div>' +
'<div class="toast-message">' + escapeHtml(message) + '</div>' +
'</div>' +
'<button class="toast-close" onclick="Notify.dismiss(' + id + ')">✕</button>';
container.appendChild(el);
const timeout = setTimeout(function() {
Notify.dismiss(id);
}, 4000);
el._timeout = timeout;
el._id = id;
return id;
},
success: function(message) {
return this.toast(message, 'success');
},
error: function(message) {
return this.toast(message, 'error');
},
info: function(message) {
return this.toast(message, 'info');
},
warning: function(message) {
return this.toast(message, 'warning');
},
dismiss: function(id) {
var el = document.getElementById('toast-' + id);
if (!el) return;
if (el._timeout) clearTimeout(el._timeout);
if (el.classList.contains('toast-removing')) return;
el.classList.add('toast-removing');
setTimeout(function() {
if (el.parentNode) el.parentNode.removeChild(el);
}, 250);
},
confirm: function(message, title, callback) {
if (typeof title === 'function') {
callback = title;
title = 'Подтверждение';
}
title = title || 'Подтверждение';
var overlay = document.createElement('div');
overlay.className = 'confirm-overlay';
overlay.innerHTML =
'<div class="confirm-dialog">' +
'<div class="confirm-dialog-header">' +
'<div class="confirm-dialog-icon confirm-dialog-icon-warning">⚠</div>' +
'<div class="confirm-dialog-title">' + escapeHtml(title) + '</div>' +
'</div>' +
'<div class="confirm-dialog-message">' + escapeHtml(message) + '</div>' +
'<div class="confirm-dialog-actions">' +
'<button class="btn btn-outline confirm-cancel">Отмена</button>' +
'<button class="btn btn-danger confirm-ok">Подтвердить</button>' +
'</div>' +
'</div>';
document.body.appendChild(overlay);
var result = false;
function close() {
if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
if (callback) callback(result);
}
overlay.querySelector('.confirm-cancel').addEventListener('click', function() {
result = false;
close();
});
overlay.querySelector('.confirm-ok').addEventListener('click', function() {
result = true;
close();
});
overlay.addEventListener('click', function(e) {
if (e.target === overlay) {
result = false;
close();
}
});
document.addEventListener('keydown', function handler(e) {
if (e.key === 'Escape') {
result = false;
close();
document.removeEventListener('keydown', handler);
}
});
return overlay;
}
};
})();
templates/_activity_sidebar.html
+18 -4
View File
@@ -184,10 +184,7 @@ document.addEventListener('DOMContentLoaded', async () => {
document.getElementById('activityToggleBtn').classList.add('visible');
}
WS.on('online_count', (data) => {
document.getElementById('onlineCount').textContent = data.online || 0;
});
async function loadActivities() {
try {
const res = await fetch('/web/api/activity?limit=10');
const data = await res.json();
@@ -197,6 +194,17 @@ document.addEventListener('DOMContentLoaded', async () => {
} catch (e) {
if (list) list.innerHTML = '<div style="text-align:center;padding:2rem;color:var(--text-secondary);">Не удалось загрузить</div>';
}
}
WS.on('online_count', (data) => {
document.getElementById('onlineCount').textContent = data.online || 0;
});
WS.on('connected', () => {
loadActivities();
});
await loadActivities();
WS.on('activity', (data) => {
const act = data.activity;
@@ -210,6 +218,12 @@ document.addEventListener('DOMContentLoaded', async () => {
list.removeChild(list.lastChild);
}
});
// Periodic refresh every 30s to catch missed activities
setInterval(loadActivities, 30000);
// Expose for manual refresh from other pages
window.refreshActivityFeed = loadActivities;
});
const RARITY_COLORS = {
templates/achievements.html
+2 -1
View File
@@ -191,7 +191,7 @@
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/achievements" class="nav-link active">🏆 Достижения</a>
<a href="/activity" class="nav-link">📰 Лента</a>
<a href="/profile" class="nav-link">Профиль</a>
@@ -272,6 +272,7 @@
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
document.addEventListener('DOMContentLoaded', () => {
templates/activity.html
+7 -5
View File
@@ -106,7 +106,7 @@
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/activity" class="nav-link active">📰 Лента</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/profile" class="nav-link">Профиль</a>
@@ -172,17 +172,21 @@
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
document.addEventListener('DOMContentLoaded', () => {
// Подключаемся к WS и слушаем новые активности
// Reload activities when WS connects/reconnects
WS.on('connected', () => {
location.reload();
});
WS.on('activity', (data) => {
const act = data.activity;
if (!act) return;
const feed = document.getElementById('activityFeed');
// Убираем empty state если есть
const empty = feed.querySelector('.activity-empty');
if (empty) empty.remove();
@@ -212,12 +216,10 @@
feed.insertBefore(item, feed.firstChild);
// Ограничиваем до 100 элементов
while (feed.children.length > 100) {
feed.removeChild(feed.lastChild);
}
// Звук для новых активностей
if (act.activity_type === 'achievement') {
SoundManager.achievement();
} else if (act.activity_type === 'crash') {
templates/admin/cases.html
+18 -10
View File
@@ -252,9 +252,11 @@ async function searchCaseItems() {
document.getElementById('caseItemSearchResults').innerHTML = html;
}
<script>if(typeof Notify==="undefined"){window.Notify={toast:function(m){alert(m)},error:function(m){alert(m)},success:function(m){alert(m)},info:function(m){alert(m)},confirm:function(m,t,c){if(c&&confirm(m))c(!0)}}}</script>
<script>
async function saveCase() {
const name = document.getElementById('caseNameInput').value.trim();
if (!name) { alert('Введите название кейса'); return; }
if (!name) { Notify.error('Введите название кейса'); return; }
const fd = new FormData();
fd.append('case_name', name);
fd.append('display_name', document.getElementById('caseDisplayName').value);
@@ -271,16 +273,18 @@ async function saveCase() {
const r = await fetch(url, { method:'POST', body:fd });
const d = await r.json();
if (d.success) { window.location.reload(); }
else alert(d.error || 'Ошибка');
else Notify.error(d.error || 'Ошибка');
}
async function deleteCase(name) {
if (!confirm(`Удалить кейс "${name}"?`)) return;
Notify.confirm(`Удалить кейс "${name}"?`, 'Подтверждение', async function(ok) {
if (!ok) return;
const fd = new FormData(); fd.append('case_name', name);
const r = await fetch(`/admin/api/cases/delete/${encodeURIComponent(name)}`, { method:'POST', body:fd });
const d = await r.json();
if (d.success) window.location.reload();
else alert(d.error);
else Notify.error(d.error);
});
}
// ─── All Items Browser ───────────────────────────────────────────────────────
@@ -318,15 +322,17 @@ async function confirmAddSection() {
const r = await fetch('/admin/api/mainpage/section/add', { method:'POST', body:fd });
const d = await r.json();
if (d.success) window.location.reload();
else alert(d.error);
else Notify.error(d.error);
}
async function deleteSection(tab) {
if (!confirm(`Удалить секцию "${tab}"?`)) return;
Notify.confirm(`Удалить секцию "${tab}"?`, 'Подтверждение', async function(ok) {
if (!ok) return;
const fd = new FormData(); fd.append('tab', tab);
const r = await fetch('/admin/api/mainpage/section/delete', { method:'POST', body:fd });
const d = await r.json();
if (d.success) window.location.reload();
else alert(d.error);
else Notify.error(d.error);
});
}
function openAddCaseModal(tab) {
@@ -345,17 +351,19 @@ async function confirmAddCase() {
const r = await fetch('/admin/api/mainpage/section/add-case', { method:'POST', body:fd });
const d = await r.json();
if (d.success) window.location.reload();
else alert(d.error);
else Notify.error(d.error);
}
async function removeCaseFromSection(tab, caseName) {
if (!confirm(`Убрать "${caseName}" из "${tab}"?`)) return;
Notify.confirm(`Убрать "${caseName}" из "${tab}"?`, 'Подтверждение', async function(ok) {
if (!ok) return;
const fd = new FormData();
fd.append('tab', tab);
fd.append('case_name', caseName);
const r = await fetch('/admin/api/mainpage/section/remove-case', { method:'POST', body:fd });
const d = await r.json();
if (d.success) window.location.reload();
else alert(d.error);
else Notify.error(d.error);
});
}
</script>
{% endblock %}
templates/admin/user_detail.html
+23 -14
View File
@@ -172,6 +172,7 @@ let currentRPU = null;
function closeModal(id) { document.getElementById(id).classList.remove('open'); }
function openModal(id) { document.getElementById(id).classList.add('open'); }
<script>if(typeof Notify==="undefined"){window.Notify={toast:function(m){alert(m)},error:function(m){alert(m)},success:function(m){alert(m)},info:function(m){alert(m)},confirm:function(m,t,c){if(c&&confirm(m))c(!0)}}}</script>
// ====== BALANCE ======
function openBalanceModal() { openModal('balanceModal'); }
async function updateBalance() {
@@ -180,8 +181,8 @@ async function updateBalance() {
fd.append('operation', document.getElementById('balanceOperation').value);
const res = await fetch(`/admin/api/user/${userId}/balance`, { method:'POST', body:fd });
const d = await res.json();
if (d.success) { alert(d.message); window.location.reload(); }
else alert(d.error);
if (d.success) { Notify.success(d.message); window.location.reload(); }
else Notify.error(d.error);
}
// ====== GIVE ITEM ======
@@ -205,31 +206,37 @@ async function giveItem(itemId) {
const fd = new FormData(); fd.append('item_id', itemId);
const res = await fetch(`/admin/api/user/${userId}/give-item`, { method:'POST', body:fd });
const d = await res.json();
if (d.success) { alert(d.message); closeModal('giveItemModal'); window.location.reload(); }
else alert(d.error);
if (d.success) { Notify.success(d.message); closeModal('giveItemModal'); window.location.reload(); }
else Notify.error(d.error);
}
// ====== DELETE ITEM ======
async function deleteItem(invId) {
if (!confirm('Удалить предмет?')) return;
Notify.confirm('Удалить предмет?', 'Подтверждение', async function(ok) {
if (!ok) return;
const res = await fetch(`/admin/api/user/${userId}/delete-item/${invId}`, { method:'POST' });
const d = await res.json();
if (d.success) window.location.reload();
else alert(d.error);
else Notify.error(d.error);
});
}
// ====== TOGGLE ADMIN / BAN ======
async function toggleAdmin() {
if (!confirm('Изменить статус админа?')) return;
Notify.confirm('Изменить статус админа?', 'Подтверждение', async function(ok) {
if (!ok) return;
const res = await fetch(`/admin/api/user/${userId}/toggle-admin`, { method:'POST' });
const d = await res.json();
if (d.success) window.location.reload(); else alert(d.error);
if (d.success) window.location.reload(); else Notify.error(d.error);
});
}
async function toggleBan() {
if (!confirm('{{ "Забанить" if not target_user.is_banned else "Разбанить" }}?')) return;
Notify.confirm('{{ "Забанить" if not target_user.is_banned else "Разбанить" }}?', 'Подтверждение', async function(ok) {
if (!ok) return;
const res = await fetch(`/admin/api/user/${userId}/toggle-ban`, { method:'POST' });
const d = await res.json();
if (d.success) window.location.reload(); else alert(d.error);
if (d.success) window.location.reload(); else Notify.error(d.error);
});
}
// ====== RPU ======
@@ -277,16 +284,18 @@ async function saveRPU() {
fd.append('auto_adjust', document.getElementById('rpuAutoAdjust').checked);
const res = await fetch(`/admin/api/user/${userId}/rpu/update`, { method:'POST', body:fd });
const d = await res.json();
if (d.success) { alert(d.message); closeModal('rpuModal'); loadRPU(); }
else alert(d.error);
if (d.success) { Notify.success(d.message); closeModal('rpuModal'); loadRPU(); }
else Notify.error(d.error);
}
async function setRPUPreset(preset) {
const names = { lucky:'🍀 Везучий', normal:'📊 Обычный', unlucky:'🌧️ Невезучий', very_unlucky:'💀 Проклятый' };
if (!confirm('Применить "'+names[preset]+'"?')) return;
Notify.confirm('Применить "'+names[preset]+'"?', 'Подтверждение', async function(ok) {
if (!ok) return;
const fd = new FormData(); fd.append('preset', preset);
const res = await fetch(`/admin/api/user/${userId}/rpu/preset`, { method:'POST', body:fd });
const d = await res.json();
if (d.success) { alert(d.message); loadRPU(); } else alert(d.error);
if (d.success) { Notify.success(d.message); loadRPU(); } else Notify.error(d.error);
});
}
document.addEventListener('DOMContentLoaded', loadRPU);
templates/case_detail.html
+31 -24
View File
@@ -223,7 +223,7 @@
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/activity" class="nav-link">📰 Лента</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/profile" class="nav-link">Профиль</a>
@@ -603,7 +603,10 @@
const hasFreeSpin = freeSpinActive;
freeSpinActive = false;
if (!hasFreeSpin && userBalance < totalPrice) {
alert(`Недостаточно средств!\nНужно: ${totalPrice.toLocaleString()} ₽\nУ вас: ${Math.floor(userBalance).toLocaleString()} ₽`);
Notify.error(`Недостаточно средств! Нужно: ${totalPrice.toLocaleString()} ₽, у вас: ${Math.floor(userBalance).toLocaleString()} ₽`);
isOpening = false;
openButton.disabled = false;
openButton.textContent = isSlotCase ? '🎰 Крутить' : '🎲 Открыть';
return;
}
isOpening = true;
@@ -658,7 +661,7 @@
if (data.new_balance !== undefined) userBalance = data.new_balance;
await refreshUserBalance();
} else {
alert(data.error || 'Ошибка при открытии');
Notify.error(data.error || 'Ошибка при открытии');
}
} else if (isFarmCase) {
// ===== ФАРМ-КЕЙС: КАРТОЧКИ С АВТОПРОДАЖЕЙ ШЛАКА =====
@@ -697,7 +700,7 @@
}
await refreshUserBalance();
} else {
alert(data.error || 'Ошибка при открытии');
Notify.error(data.error || 'Ошибка при открытии');
}
} else if (fast) {
// ===== БЫСТРОЕ ОТКРЫТИЕ БЕЗ АНИМАЦИИ =====
@@ -720,7 +723,7 @@
if (data.new_balance !== undefined) userBalance = data.new_balance;
await refreshUserBalance();
} else {
alert(data.error || 'Ошибка при открытии');
Notify.error(data.error || 'Ошибка при открытии');
}
} else {
// ===== ОБЫЧНЫЙ КЕЙС: СКРОЛЛЫ (РУЛЕТКА) =====
@@ -763,7 +766,7 @@
})();
if (!batchData.success) {
alert(batchData.error || 'Ошибка при открытии');
Notify.error(batchData.error || 'Ошибка при открытии');
} else {
handleAchievements(batchData);
SoundManager.caseOpen();
@@ -797,7 +800,7 @@
}
} catch (error) {
console.error('Error opening cases:', error);
alert('Ошибка при открытии кейсов');
Notify.error('Ошибка при открытии кейсов');
} finally {
isOpening = false;
openButton.disabled = false;
@@ -1338,13 +1341,13 @@
async function sellAllTopDrops() {
if (topDropItems.length === 0) {
alert('Нет предметов для продажи');
Notify.error('Нет предметов для продажи');
return;
}
const total = topDropItems.reduce((sum, i) => sum + (i.price || 100), 0);
if (!confirm(`Продать все топ-дропы за ${total.toLocaleString()} ₽?`)) return;
Notify.confirm('Продать все топ-дропы за ' + total.toLocaleString() + ' ₽?', 'Продажа', async function(confirmed) {
if (!confirmed) return;
try {
const response = await fetch('/web/api/inventory/items');
const items = await response.json();
@@ -1373,8 +1376,9 @@
topDropItems = [];
resetCaseUI();
} catch (error) {
alert('Ошибка соединения');
Notify.error('Ошибка соединения');
}
});
}
// ===== ЭФФЕКТЫ =====
@@ -1749,15 +1753,15 @@
}
async function sellResultItem(itemId) {
if (!confirm('Продать этот предмет?')) return;
Notify.confirm('Продать этот предмет?', 'Продажа', async function(confirmed) {
if (!confirmed) return;
try {
const response = await fetch('/web/api/inventory/items');
const items = await response.json();
const inventoryItem = items.find(i => i.item_id === itemId);
if (!inventoryItem) {
alert('Предмет не найден в инвентаре');
Notify.error('Предмет не найден в инвентаре');
return;
}
@@ -1772,9 +1776,9 @@
const data = await sellResponse.json();
if (data.success) {
Notify.success('Предмет продан за ' + data.sold_price.toFixed(0) + ' ₽');
await refreshUserBalance();
await refreshInventoryAjax();
// Remove the sold item card from display
const cards = document.querySelectorAll('.result-card-enhanced');
for (const card of cards) {
const btn = card.querySelector('.btn-sell-result');
@@ -1787,22 +1791,23 @@
}
}
} else {
alert(data.error || 'Ошибка при продаже');
Notify.error(data.error || 'Ошибка при продаже');
}
} catch (error) {
alert('Ошибка соединения');
Notify.error('Ошибка соединения');
}
});
}
async function sellAllResults() {
if (!window.lastOpenedItems || window.lastOpenedItems.length === 0) {
alert('Нет предметов для продажи');
Notify.error('Нет предметов для продажи');
return;
}
const total = window.lastOpenedItems.reduce((sum, i) => sum + (i.price || 100), 0);
if (!confirm(`Продать все выпавшие предметы за ${total.toLocaleString()} ₽?`)) return;
Notify.confirm('Продать все выпавшие предметы за ' + total.toLocaleString() + ' ₽?', 'Продажа', async function(confirmed) {
if (!confirmed) return;
try {
const response = await fetch('/web/api/inventory/items');
const items = await response.json();
@@ -1817,7 +1822,7 @@
}
if (inventoryIds.length === 0) {
alert('Предметы не найдены в инвентаре');
Notify.error('Предметы не найдены в инвентаре');
return;
}
@@ -1832,19 +1837,20 @@
const data = await sellResponse.json();
if (data.success) {
Notify.success('Продано ' + data.sold_count + ' предметов за ' + data.total_received.toFixed(0) + ' ₽');
await refreshUserBalance();
await refreshInventoryAjax();
// Clear results and reset UI
const resultsDiv = document.getElementById('openingResults');
resultsDiv.style.display = 'none';
resultsDiv.innerHTML = '';
window.lastOpenedItems = [];
} else {
alert(data.error || 'Ошибка при продаже');
Notify.error(data.error || 'Ошибка при продаже');
}
} catch (error) {
alert('Ошибка соединения');
Notify.error('Ошибка соединения');
}
});
}
function filterItems(rarity) {
@@ -1879,6 +1885,7 @@
</script>
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
function handleAchievements(data) {
templates/cases.html
+2 -1
View File
@@ -164,7 +164,7 @@
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/activity" class="nav-link">📰 Лента</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/profile" class="nav-link">Профиль</a>
@@ -243,6 +243,7 @@
</script>
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
function toggleSound() {
templates/contracts.html
+4 -3
View File
@@ -16,7 +16,7 @@
<a href="/contracts" class="nav-link active">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/profile" class="nav-link">Профиль</a>
<span class="user-balance">{{ "%.0f"|format(user.balance) }} ₽</span>
@@ -682,9 +682,9 @@
ctClosePaper();
setTimeout(() => ctShowResult(data.received_item, data.is_knife_contract), 200);
} else {
SoundManager.error(); alert(data.error || 'Ошибка'); ctClosePaper();
SoundManager.error(); Notify.error(data.error || 'Ошибка'); ctClosePaper();
}
} catch(_) { SoundManager.error(); alert('Ошибка соединения'); ctClosePaper(); }
} catch(_) { SoundManager.error(); Notify.error('Ошибка соединения'); ctClosePaper(); }
btn.disabled = false; btn.textContent = '✍ ПОДПИСАТЬ';
}
@@ -732,6 +732,7 @@
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
{% if user %}{% include '_activity_sidebar.html' %}{% endif %}
</body>
templates/crash.html
+6 -5
View File
@@ -73,7 +73,7 @@
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link active">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/activity" class="nav-link">📰 Лента</a>
<a href="/profile" class="nav-link">Профиль</a>
@@ -136,6 +136,7 @@
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
const canvas = document.getElementById('crashCanvas');
@@ -468,11 +469,11 @@
updateUI();
} else {
SoundManager.error();
alert(data.error);
Notify.error(data.error);
}
} catch (e) {
SoundManager.error();
alert('Ошибка соединения');
Notify.error('Ошибка соединения');
}
}
@@ -491,11 +492,11 @@
updateUI();
} else {
SoundManager.error();
alert(data.error);
Notify.error(data.error);
}
} catch (e) {
SoundManager.error();
alert('Ошибка соединения');
Notify.error('Ошибка соединения');
}
}
templates/inventory.html
-802
View File
@@ -1,802 +0,0 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Инвентарь - CS2 Simulator</title>
<link rel="stylesheet" href="/static/css/style.css">
<style>
.inventory-actions {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 1rem;
flex-wrap: wrap;
gap: 1rem;
}
.selection-controls {
display: flex;
align-items: center;
gap: 0.75rem;
}
.select-all-checkbox {
display: flex;
align-items: center;
gap: 0.5rem;
cursor: pointer;
}
.select-all-checkbox input {
width: 18px;
height: 18px;
cursor: pointer;
}
.sell-selected-btn {
padding: 0.5rem 1.5rem;
background: var(--danger-color);
color: white;
border: none;
border-radius: 8px;
cursor: pointer;
font-weight: 500;
transition: all 0.2s;
}
.sell-selected-btn:hover {
background: #dc2626;
transform: translateY(-1px);
}
.sell-selected-btn:disabled {
opacity: 0.5;
cursor: not-allowed;
}
.sell-all-btn {
padding: 0.5rem 1.5rem;
background: transparent;
color: var(--danger-color);
border: 1px solid var(--danger-color);
border-radius: 8px;
cursor: pointer;
font-weight: 500;
transition: all 0.2s;
}
.sell-all-btn:hover {
background: rgba(239, 68, 68, 0.1);
}
.inventory-skin-card {
position: relative;
}
.item-select-checkbox {
position: absolute;
top: 8px;
left: 8px;
width: 20px;
height: 20px;
cursor: pointer;
z-index: 10;
accent-color: var(--primary-color);
}
.inventory-skin-card.selected-for-sale {
border-color: var(--danger-color);
box-shadow: 0 0 15px rgba(239, 68, 68, 0.3);
}
.selected-count-badge {
background: var(--danger-color);
color: white;
padding: 0.25rem 0.75rem;
border-radius: 20px;
font-size: 0.85rem;
font-weight: 500;
}
.total-price-badge {
background: var(--success-color);
color: white;
padding: 0.25rem 0.75rem;
border-radius: 20px;
font-size: 0.85rem;
font-weight: 500;
}
.item-actions {
display: flex;
gap: 0.5rem;
margin-top: 8px;
}
.btn-sell-single {
flex: 1;
padding: 0.25rem;
background: transparent;
border: 1px solid var(--danger-color);
color: var(--danger-color);
border-radius: 4px;
cursor: pointer;
font-size: 0.75rem;
transition: all 0.2s;
}
.btn-sell-single:hover {
background: var(--danger-color);
color: white;
}
.filter-bar {
display: flex;
gap: 0.5rem;
flex-wrap: wrap;
}
.bulk-sell-modal {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.8);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
}
.bulk-sell-content {
background: var(--bg-card);
padding: 2rem;
border-radius: 12px;
max-width: 400px;
width: 90%;
}
.bulk-sell-content h3 {
margin-bottom: 1rem;
}
.bulk-sell-options {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin: 1.5rem 0;
}
.bulk-sell-option {
display: flex;
align-items: center;
gap: 0.75rem;
padding: 0.75rem;
background: var(--bg-dark);
border-radius: 8px;
cursor: pointer;
transition: all 0.2s;
}
.bulk-sell-option:hover {
background: var(--bg-light);
}
.bulk-sell-option input {
width: 18px;
height: 18px;
}
.bulk-sell-actions {
display: flex;
gap: 1rem;
justify-content: flex-end;
}
</style>
</head>
<body>
<nav class="navbar">
<div class="container">
<a href="/" class="logo">🎮 CS2 Simulator</a>
<div class="nav-links">
<a href="/cases" class="nav-link">Кейсы</a>
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/activity" class="nav-link">📰 Лента</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/profile" class="nav-link">Профиль</a>
<span class="user-balance">{{ "%.2f"|format(user.balance) }} ₽</span>
<button onclick="toggleSound()" class="btn btn-outline" id="soundToggle" title="Звук">🔊</button>
<button onclick="toggleSafeMode()" class="btn btn-outline" id="safeModeToggle" title="Режим записи">🎙️</button>
<button onclick="logout()" class="btn btn-outline">Выйти</button>
</div>
</div>
</nav>
<main class="inventory-container">
<div class="container">
<div class="inventory-header">
<div>
<h1>🎒 Инвентарь</h1>
<p class="page-subtitle">Всего предметов: <span id="totalItemsCount">{{ inventory_items|length }}</span></p>
</div>
<div class="inventory-actions">
<div class="selection-controls">
<label class="select-all-checkbox">
<input type="checkbox" id="selectAllCheckbox" onchange="toggleSelectAll()">
<span>Выбрать все</span>
</label>
<span class="selected-count-badge" id="selectedCountBadge" style="display: none;">0</span>
<span class="total-price-badge" id="totalPriceBadge" style="display: none;">0 ₽</span>
</div>
<div style="display: flex; gap: 0.75rem;">
<button class="sell-selected-btn" id="sellSelectedBtn" onclick="sellSelected()" disabled>
💰 Продать выбранные
</button>
<button class="sell-all-btn" onclick="openBulkSellModal()">
📦 Массовая продажа
</button>
</div>
</div>
</div>
<div class="inventory-filters">
<div class="filter-bar">
<select id="rarityFilter" class="filter-select" onchange="filterItems()">
<option value="">Все редкости</option>
{% for rarity in rarities %}
<option value="{{ rarity }}">{{ rarity }}</option>
{% endfor %}
</select>
<select id="typeFilter" class="filter-select" onchange="filterItems()">
<option value="">Все типы</option>
{% for type in types %}
<option value="{{ type }}">{{ type }}</option>
{% endfor %}
</select>
<input type="text" id="searchInput" class="filter-select"
placeholder="Поиск по названию..." oninput="filterItems()">
<button onclick="resetFilters()" class="btn btn-outline">Сбросить</button>
</div>
</div>
{% if inventory_items %}
<div class="inventory-grid-detailed" id="inventoryGrid">
{% for item in inventory_items %}
<div class="inventory-skin-card rarity-{{ item.rarity|lower|replace(' ', '-') }}"
data-inventory-id="{{ item.id }}"
data-rarity="{{ item.rarity }}"
data-type="{{ item.type }}"
data-name="{{ item.name|lower }}"
data-price="{{ item.price_rub or 100 }}">
<input type="checkbox" class="item-select-checkbox"
onchange="onItemSelect(this)"
data-id="{{ item.id }}"
data-price="{{ item.price_rub or 100 }}">
<div class="skin-image-container">
<img src="{{ item.image_url or '/static/placeholder.png' }}"
alt="{{ item.name }}"
class="skin-image"
onerror="this.src='/static/placeholder.png'">
</div>
<div class="skin-info">
<div class="skin-name" title="{{ item.name }}">{{ item.name }}</div>
<div class="skin-details">
<span class="rarity-{{ item.rarity|lower|replace(' ', '-') }}">{{ item.rarity }}</span>
<span>Float: {{ "%.6f"|format(item.float) }}</span>
</div>
<div class="skin-details" style="margin-top: 5px;">
<span>{{ item.type }}</span>
<span>{{ item.wear }}</span>
</div>
<div class="skin-details" style="margin-top: 5px; color: var(--success-color);">
<span>💰 {{ "%.0f"|format(item.price_rub or 100) }} ₽</span>
</div>
<div class="item-actions">
<button onclick="sellSingleItem({{ item.id }})" class="btn-sell-single">
Продать
</button>
</div>
</div>
</div>
{% endfor %}
</div>
{% else %}
<div class="empty-state-large">
<div class="empty-icon">📭</div>
<h3>Ваш инвентарь пуст</h3>
<p>Откройте кейсы, чтобы получить первые предметы!</p>
<a href="/cases" class="btn btn-primary">Открыть кейсы</a>
</div>
{% endif %}
</div>
</main>
<!-- Модальное окно массовой продажи -->
<div id="bulkSellModal" class="bulk-sell-modal" style="display: none;">
<div class="bulk-sell-content">
<h3>📦 Массовая продажа</h3>
<p>Выберите редкости предметов для продажи:</p>
<div class="bulk-sell-options" id="bulkSellOptions">
<!-- Опции будут добавлены через JS -->
</div>
<div style="margin: 1rem 0;">
<p>Будет продано: <strong id="bulkSellCount">0</strong> предметов</p>
<p>Сумма: <strong id="bulkSellTotal" style="color: var(--success-color);">0 ₽</strong></p>
</div>
<div class="bulk-sell-actions">
<button class="btn btn-outline" onclick="closeBulkSellModal()">Отмена</button>
<button class="btn btn-primary" onclick="executeBulkSell()" style="background: var(--danger-color);">
Продать
</button>
</div>
</div>
</div>
<script>
let selectedItems = new Set();
let itemPrices = new Map();
// Инициализация цен
document.querySelectorAll('.inventory-skin-card').forEach(card => {
const id = parseInt(card.dataset.inventoryId);
const price = parseFloat(card.dataset.price);
itemPrices.set(id, price);
});
function onItemSelect(checkbox) {
const card = checkbox.closest('.inventory-skin-card');
const itemId = parseInt(checkbox.dataset.id);
if (checkbox.checked) {
selectedItems.add(itemId);
card.classList.add('selected-for-sale');
} else {
selectedItems.delete(itemId);
card.classList.remove('selected-for-sale');
document.getElementById('selectAllCheckbox').checked = false;
}
updateSelectionUI();
}
function toggleSelectAll() {
const selectAll = document.getElementById('selectAllCheckbox');
const checkboxes = document.querySelectorAll('.item-select-checkbox');
checkboxes.forEach(cb => {
if (cb.closest('.inventory-skin-card').style.display !== 'none') {
cb.checked = selectAll.checked;
const card = cb.closest('.inventory-skin-card');
const itemId = parseInt(cb.dataset.id);
if (selectAll.checked) {
selectedItems.add(itemId);
card.classList.add('selected-for-sale');
} else {
selectedItems.delete(itemId);
card.classList.remove('selected-for-sale');
}
}
});
updateSelectionUI();
}
function updateSelectionUI() {
const count = selectedItems.size;
const countBadge = document.getElementById('selectedCountBadge');
const priceBadge = document.getElementById('totalPriceBadge');
const sellBtn = document.getElementById('sellSelectedBtn');
if (count > 0) {
countBadge.style.display = 'inline-block';
countBadge.textContent = `${count} выбрано`;
let total = 0;
selectedItems.forEach(id => {
total += itemPrices.get(id) || 100;
});
priceBadge.style.display = 'inline-block';
priceBadge.textContent = `${total.toFixed(0)} ₽`;
sellBtn.disabled = false;
} else {
countBadge.style.display = 'none';
priceBadge.style.display = 'none';
sellBtn.disabled = true;
}
}
async function refreshBalance() {
try {
const response = await fetch('/web/api/user/balance');
const data = await response.json();
if (data.success) {
document.querySelectorAll('.user-balance').forEach(el => {
el.textContent = `${Math.floor(data.balance)} ₽`;
});
}
} catch (e) {}
}
async function sellSingleItem(inventoryId) {
if (!confirm('Продать этот предмет?')) return;
SoundManager.click();
const formData = new FormData();
formData.append('inventory_id', inventoryId);
try {
const response = await fetch('/web/api/inventory/sell', {
method: 'POST',
body: formData
});
const data = await response.json();
if (data.success) {
SoundManager.balanceUpdate();
const card = document.querySelector(`.inventory-skin-card[data-id="${inventoryId}"]`);
if (card) {
card.style.transition = 'all 0.3s';
card.style.opacity = '0';
card.style.transform = 'scale(0.8)';
setTimeout(() => card.remove(), 300);
}
await refreshBalance();
} else {
SoundManager.error();
alert(data.error || 'Ошибка при продаже');
}
} catch (error) {
SoundManager.error();
alert('Ошибка соединения');
}
}
async function sellSelected() {
if (selectedItems.size === 0) return;
let total = 0;
selectedItems.forEach(id => {
total += itemPrices.get(id) || 100;
});
if (!confirm(`Продать ${selectedItems.size} предметов за ${total.toFixed(0)} ₽?`)) return;
SoundManager.click();
const ids = Array.from(selectedItems);
const formData = new FormData();
formData.append('inventory_ids', JSON.stringify(ids));
try {
const response = await fetch('/web/api/inventory/sell/bulk', {
method: 'POST',
body: formData
});
const data = await response.json();
if (data.success) {
selectedItems.forEach(id => {
const card = document.querySelector(`.inventory-skin-card[data-id="${id}"]`);
if (card) {
card.style.transition = 'all 0.3s';
card.style.opacity = '0';
card.style.transform = 'scale(0.8)';
setTimeout(() => card.remove(), 300);
}
});
selectedItems.clear();
await refreshBalance();
} else {
alert(data.error || 'Ошибка при продаже');
}
} catch (error) {
alert('Ошибка соединения');
}
}
function openBulkSellModal() {
const modal = document.getElementById('bulkSellModal');
const optionsDiv = document.getElementById('bulkSellOptions');
// Собираем уникальные редкости из видимых предметов
const rarities = new Set();
document.querySelectorAll('.inventory-skin-card').forEach(card => {
if (card.style.display !== 'none') {
rarities.add(card.dataset.rarity);
}
});
// Создаем опции
optionsDiv.innerHTML = '';
Array.from(rarities).sort().forEach(rarity => {
const count = document.querySelectorAll(`.inventory-skin-card[data-rarity="${rarity}"]`).length;
const option = document.createElement('label');
option.className = 'bulk-sell-option';
option.innerHTML = `
<input type="checkbox" value="${rarity}" onchange="updateBulkSellCount()">
<span style="flex: 1;">
<span class="rarity-${rarity.toLowerCase().replace(/ /g, '-')}">${rarity}</span>
</span>
<span style="color: var(--text-secondary);">${count} шт.</span>
`;
optionsDiv.appendChild(option);
});
// Добавляем опцию "Все"
const allOption = document.createElement('label');
allOption.className = 'bulk-sell-option';
allOption.innerHTML = `
<input type="checkbox" value="all" onchange="toggleAllRarities(this)">
<span style="flex: 1; font-weight: 500;">Все предметы</span>
<span style="color: var(--text-secondary);" id="totalVisibleCount">0</span>
`;
optionsDiv.insertBefore(allOption, optionsDiv.firstChild);
updateVisibleCount();
updateBulkSellCount();
modal.style.display = 'flex';
}
function closeBulkSellModal() {
document.getElementById('bulkSellModal').style.display = 'none';
}
function toggleAllRarities(checkbox) {
const checkboxes = document.querySelectorAll('#bulkSellOptions input[type="checkbox"]');
checkboxes.forEach(cb => {
if (cb !== checkbox) {
cb.checked = checkbox.checked;
}
});
updateBulkSellCount();
}
function updateVisibleCount() {
const visibleCards = document.querySelectorAll('.inventory-skin-card:not([style*="display: none"])');
document.getElementById('totalVisibleCount').textContent = visibleCards.length;
}
function updateBulkSellCount() {
const selectedRarities = [];
document.querySelectorAll('#bulkSellOptions input[type="checkbox"]:checked').forEach(cb => {
if (cb.value && cb.value !== 'all') {
selectedRarities.push(cb.value);
}
});
const allChecked = document.querySelector('#bulkSellOptions input[value="all"]')?.checked;
let count = 0;
let total = 0;
document.querySelectorAll('.inventory-skin-card').forEach(card => {
if (card.style.display !== 'none') {
const rarity = card.dataset.rarity;
if (allChecked || selectedRarities.includes(rarity)) {
count++;
total += parseFloat(card.dataset.price) || 100;
}
}
});
document.getElementById('bulkSellCount').textContent = count;
document.getElementById('bulkSellTotal').textContent = `${total.toFixed(0)} ₽`;
}
async function executeBulkSell() {
const selectedRarities = [];
document.querySelectorAll('#bulkSellOptions input[type="checkbox"]:checked').forEach(cb => {
if (cb.value && cb.value !== 'all') {
selectedRarities.push(cb.value);
}
});
const allChecked = document.querySelector('#bulkSellOptions input[value="all"]')?.checked;
const idsToSell = [];
document.querySelectorAll('.inventory-skin-card').forEach(card => {
if (card.style.display !== 'none') {
const rarity = card.dataset.rarity;
if (allChecked || selectedRarities.includes(rarity)) {
idsToSell.push(parseInt(card.dataset.inventoryId));
}
}
});
if (idsToSell.length === 0) {
alert('Выберите хотя бы одну редкость');
return;
}
if (!confirm(`Продать ${idsToSell.length} предметов?`)) return;
const formData = new FormData();
formData.append('inventory_ids', JSON.stringify(idsToSell));
try {
const response = await fetch('/web/api/inventory/sell/bulk', {
method: 'POST',
body: formData
});
const data = await response.json();
if (data.success) {
await refreshBalance();
// Remove all cards with animation
document.querySelectorAll('.inventory-skin-card').forEach(card => {
card.style.transition = 'all 0.3s';
card.style.opacity = '0';
card.style.transform = 'scale(0.8)';
setTimeout(() => card.remove(), 300);
});
} else {
alert(data.error || 'Ошибка при продаже');
}
} catch (error) {
alert('Ошибка соединения');
}
}
function filterItems() {
const rarityFilter = document.getElementById('rarityFilter').value.toLowerCase();
const typeFilter = document.getElementById('typeFilter').value.toLowerCase();
const searchQuery = document.getElementById('searchInput').value.toLowerCase();
const items = document.querySelectorAll('.inventory-skin-card');
let visibleCount = 0;
items.forEach(item => {
const rarity = item.dataset.rarity.toLowerCase();
const type = item.dataset.type.toLowerCase();
const name = item.dataset.name;
let visible = true;
if (rarityFilter && rarity !== rarityFilter) visible = false;
if (typeFilter && type !== typeFilter) visible = false;
if (searchQuery && !name.includes(searchQuery)) visible = false;
item.style.display = visible ? 'block' : 'none';
if (visible) visibleCount++;
});
document.getElementById('totalItemsCount').textContent = visibleCount;
// Сбрасываем выбор при фильтрации
selectedItems.clear();
document.querySelectorAll('.item-select-checkbox').forEach(cb => cb.checked = false);
document.querySelectorAll('.inventory-skin-card').forEach(c => c.classList.remove('selected-for-sale'));
document.getElementById('selectAllCheckbox').checked = false;
updateSelectionUI();
}
function resetFilters() {
document.getElementById('rarityFilter').value = '';
document.getElementById('typeFilter').value = '';
document.getElementById('searchInput').value = '';
filterItems();
}
async function logout() {
await fetch('/web/api/auth/logout', { method: 'POST' });
window.location.href = '/';
}
// Закрытие модального окна по клику вне
document.getElementById('bulkSellModal').addEventListener('click', (e) => {
if (e.target.classList.contains('bulk-sell-modal')) {
closeBulkSellModal();
}
});
</script>
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
function toggleSound() {
const enabled = SoundManager.toggle();
document.getElementById('soundToggle').textContent = enabled ? '🔊' : '🔇';
}
document.addEventListener('DOMContentLoaded', () => {
const btn = document.getElementById('soundToggle');
if (btn) btn.textContent = localStorage.getItem('sound_enabled') !== 'false' ? '🔊' : '🔇';
});
</script>
<script>
// Живое обновление через WebSocket
WS.on('inventory_update', () => refreshInventory());
WS.on('item_sold', () => refreshInventory());
WS.on('balance_update', () => { if (typeof refreshBalance === 'function') refreshBalance(); });
let refreshTimeout;
function refreshInventory() {
clearTimeout(refreshTimeout);
refreshTimeout = setTimeout(() => {
fetch('/web/api/inventory/items')
.then(r => r.json())
.then(items => rebuildInventoryGrid(items))
.catch(() => {});
}, 800);
}
function rebuildInventoryGrid(items) {
const grid = document.getElementById('inventoryGrid');
if (!grid) return;
if (!items.length) {
grid.innerHTML = '<div class="empty-state-large"><div class="empty-icon">📭</div><h3>Ваш инвентарь пуст</h3><p>Откройте кейсы, чтобы получить первые предметы!</p><a href="/cases" class="btn btn-primary">Открыть кейсы</a></div>';
document.getElementById('selectAllCheckbox') && (document.getElementById('selectAllCheckbox').checked = false);
selectedItems.clear();
updateSelectionUI();
return;
}
let html = '';
items.forEach(item => {
const rarityClass = (item.rarity || 'unknown').toLowerCase().replace(/\s+/g, '-');
const image = item.image_url || '/static/placeholder.png';
const floatStr = item.float !== null && item.float !== undefined ? 'Float: ' + item.float.toFixed(6) : '';
const wearStr = item.wear || '';
const typeStr = item.type || '';
html += `<div class="inventory-skin-card rarity-${rarityClass}"
data-inventory-id="${item.id}"
data-rarity="${item.rarity || ''}"
data-type="${typeStr}"
data-name="${(item.name || '').toLowerCase()}"
data-price="${item.price_rub || 100}">
<input type="checkbox" class="item-select-checkbox"
onchange="onItemSelect(this)"
data-id="${item.id}"
data-price="${item.price_rub || 100}">
<div class="skin-image-container">
<img src="${image}" alt="${item.name}" class="skin-image" onerror="this.src='/static/placeholder.png'">
</div>
<div class="skin-info">
<div class="skin-name" title="${item.name}">${item.name}</div>
<div class="skin-details">
<span class="rarity-${rarityClass}">${item.rarity || ''}</span>
<span>${floatStr}</span>
</div>
<div class="skin-details" style="margin-top:5px">
<span>${typeStr}</span>
<span>${wearStr}</span>
</div>
<div class="skin-details" style="margin-top:5px;color:var(--success-color)">
<span>💰 ${(item.price_rub || 100).toLocaleString()} ₽</span>
</div>
<div class="item-actions">
<button onclick="sellSingleItem(${item.id})" class="btn-sell-single">Продать</button>
</div>
</div>
</div>`;
});
grid.innerHTML = html;
selectedItems.clear();
updateSelectionUI();
document.getElementById('selectAllCheckbox') && (document.getElementById('selectAllCheckbox').checked = false);
if (typeof filterItems === 'function') filterItems();
}
</script>
{% include '_activity_sidebar.html' %}
</body>
</html>
templates/profile.html
+880 -42
View File
File diff suppressed because it is too large Load Diff
templates/upgrade.html
+5 -4
View File
@@ -16,7 +16,7 @@
<a href="/contracts" class="nav-link">Контракты</a>
<a href="/upgrade" class="nav-link active">🆙 Апгрейд</a>
<a href="/crash" class="nav-link">💥 Crash</a>
<a href="/inventory" class="nav-link">Инвентарь</a>
<a href="/profile" class="nav-link">Профиль</a>
<a href="/activity" class="nav-link">📰 Лента</a>
<a href="/achievements" class="nav-link">🏆 Достижения</a>
<a href="/profile" class="nav-link">Профиль</a>
@@ -475,7 +475,7 @@
if (isSpinning) return;
const card = event.target.closest('.target-item-card');
if (card.classList.contains('disabled')) {
alert('Этот предмет не подходит!');
Notify.error('Этот предмет не подходит!');
return;
}
@@ -752,13 +752,13 @@
// Запасной таймер на случай если transitionend не сработает
setTimeout(showResult, spinDuration * 1000 + 300);
} else {
alert(data.error || 'Ошибка');
Notify.error(data.error || 'Ошибка');
isSpinning = false;
btn.disabled = false;
btn.textContent = '🎲 Апгрейд';
}
} catch (e) {
alert('Ошибка соединения');
Notify.error('Ошибка соединения');
isSpinning = false;
btn.disabled = false;
btn.textContent = '🎲 Апгрейд';
@@ -797,6 +797,7 @@
</script>
<script src="/static/js/sounds.js"></script>
<script src="/static/js/websocket.js"></script>
<script src="/static/js/notifications.js"></script>
<script src="/static/js/safemode.js"></script>
<script>
function handleAchievements(data) {