RPU v2, promo/bank система, админка, оптимизации

— RPU v2: бюджет удачи, потолок (ceiling), комбек после
  проигрышей, hot/cold анализ, интеграция с promo-фазами
— Bank API: mock-банк для карты (депозит/вывод с балансом 1000₽)
— Promo-сервис: автогенерация промокодов каждый час, типы
  (card_to_site, luck_boost, ceiling_boost, free_case, reset_streak)
— Promo-фазы: LUCKY/NEUTRAL/UNLUCKY, переключение каждые 1-6ч
— Admin: история транзакций (user_history), управление промокодами,
  управление promo-фазами, API фильтров/коллекций, RPU info
— Database: WAL mode, новые поля RPU v2, TransactionLog,
  карточный баланс, статистики (streaks, ceiling, budget)
— Frontend: /deposit, /promo/activate, /withdraw, /card-balance,
  /online-count, /rpu-info, lifespan вместо startup event
— UI: user_history.html, улучшения профиля, кейсов, навигации
— Cases: обновление cases.json (1892 строки новых данных)
— Achievements: кэш коллекций, оптимизация is_custom проверок
— Sounds: дополнительные звуковые эффекты
— Upgrade: интеграция с RPU (множители, streaks)
— .gitignore: исключены .db, .bak, __pycache__
This commit is contained in:
2026-07-25 13:11:08 +00:00
parent 6638ab99f3
commit 47c7f17c90
30 changed files with 5862 additions and 1295 deletions
+77 -10
View File
@@ -140,6 +140,56 @@
from { opacity: 0; transform: translateY(-5px); }
to { opacity: 1; transform: translateY(0); }
}
/* Иммерсивные эффекты для ленты */
.asi-effect {
position: relative;
overflow: hidden;
}
.asi-effect::before {
content: attr(data-effect-text);
position: absolute;
top: 50%; left: 50%;
transform: translate(-50%, -50%);
font-size: 2.5rem;
font-weight: 900;
color: currentColor;
opacity: 0.06;
pointer-events: none;
white-space: nowrap;
line-height: 1;
}
.asi-effect-glow {
box-shadow: 0 0 15px 2px rgba(255, 200, 50, 0.15), inset 0 0 20px rgba(255, 200, 50, 0.05);
animation: glowPulse 2s ease-in-out infinite;
}
@keyframes glowPulse {
0%,100% { box-shadow: 0 0 15px 2px rgba(255,200,50,0.15), inset 0 0 20px rgba(255,200,50,0.05); }
50% { box-shadow: 0 0 25px 5px rgba(255,200,50,0.25), inset 0 0 30px rgba(255,200,50,0.08); }
}
.asi-effect-shimmer {
position: absolute;
top: 0; left: -100%;
width: 100%; height: 100%;
background: linear-gradient(90deg, transparent, rgba(255,255,255,0.07), transparent);
animation: shimmer 3s ease-in-out infinite;
pointer-events: none;
}
@keyframes shimmer {
0% { left: -100%; }
50% { left: 200%; }
100% { left: -100%; }
}
.asi-effect-badge {
display: inline-block;
font-size: 0.6rem;
font-weight: 700;
padding: 0.1rem 0.4rem;
border-radius: 4px;
margin-top: 0.15rem;
}
.asi-effect-badge.upgrade { background: rgba(139,92,246,0.25); color: #a78bfa; }
.asi-effect-badge.drop { background: rgba(251,191,36,0.25); color: #fbbf24; }
.has-activity-sidebar {
padding-left: 260px;
transition: padding-left 0.3s cubic-bezier(0.4, 0.0, 0.2, 1);
@@ -157,9 +207,6 @@
<div class="activity-sidebar" id="activitySidebar">
<div class="activity-sidebar-header">
<h3><span class="live-dot"></span> Лента</h3>
<span style="font-size:0.7rem;color:var(--text-secondary);display:flex;align-items:center;gap:0.25rem;">
<span id="onlineCount">0</span> 👤
</span>
<button class="activity-sidebar-close" onclick="toggleActivitySidebar()" title="Скрыть"></button>
</div>
<div class="activity-sidebar-list" id="activitySidebarList">
@@ -198,11 +245,6 @@ document.addEventListener('DOMContentLoaded', () => {
});
}
WS.on('online_count', (data) => {
const el = document.getElementById('onlineCount');
if (el) el.textContent = data.online || 0;
});
WS.on('activity', (data) => {
const act = data.activity;
if (!act || !list) return;
@@ -241,8 +283,32 @@ function createActivityItem(act) {
const raritySlug = (act.data && act.data.rarity || '').toLowerCase().replace(/ /g, '-').replace(/_/g, '-').replace(/™/g, '');
const rarityColor = ACTIVITY_RARITY_COLORS[raritySlug] || '';
if (rarityColor) {
item.style.background = `rgba(${hexToRgb(rarityColor)}, 0.08)`;
// ── Эффект ──
const effect = act.data && act.data.effect;
let effectBadgeHtml = '';
if (effect) {
const isUpgrade = effect.startsWith('upgrade:');
const isDrop = effect.startsWith('drop:');
const label = effect.replace('upgrade:', '').replace('drop:', '');
const cls = isUpgrade ? 'upgrade' : 'drop';
effectBadgeHtml = `<span class="asi-effect-badge ${cls}">${label}</span>`;
item.classList.add('asi-effect');
item.dataset.effectText = label;
if (isDrop) {
item.classList.add('asi-effect-glow');
const sh = document.createElement('div');
sh.className = 'asi-effect-shimmer';
item.appendChild(sh);
}
if (rarityColor) {
item.style.background = `rgba(${hexToRgb(rarityColor)}, 0.12)`;
item.style.borderLeft = `3px solid ${rarityColor}`;
}
} else {
if (rarityColor) {
item.style.background = `rgba(${hexToRgb(rarityColor)}, 0.08)`;
}
}
item.addEventListener('click', () => window.location.href = `/profiles/${act.user_id}`);
@@ -260,6 +326,7 @@ function createActivityItem(act) {
<span class="asi-username">${escapeHtml(act.username)}</span>
<span>${escapeHtml(act.message)}</span>
<div class="asi-time">${timeStr}</div>
${effectBadgeHtml}
</div>
${imgHtml}
`;
+1 -4
View File
@@ -257,9 +257,6 @@
{% if ach.hidden %}<div class="secret-badge">🤫 Секрет</div>{% endif %}
<div class="achievement-title">{{ ach.title }}</div>
<div class="achievement-desc">{{ ach.description }}</div>
{% if ach.reward_amount > 0 %}
<div class="achievement-reward">+{{ ach.reward_amount|money }} ₽</div>
{% endif %}
<div class="achievement-progress">
<div class="progress-bar">
<div class="progress-fill {{ 'complete' if ach.unlocked else '' }}"
@@ -308,7 +305,7 @@
function showAchievementPopup(title, reward) {
const popup = document.getElementById('achievementPopup');
document.getElementById('popupTitle').textContent = title;
document.getElementById('popupReward').textContent = reward ? `+${reward}` : '';
document.getElementById('popupReward').textContent = '';
popup.style.display = 'block';
SoundManager.achievement();
setTimeout(() => {
-214
View File
@@ -1,214 +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>
.activity-feed {
max-width: 700px;
margin: 0 auto;
}
.activity-item {
display: flex;
gap: 1rem;
padding: 0.75rem 1rem;
background: var(--bg-card);
border: 1px solid var(--border-color);
border-radius: 10px;
margin-bottom: 0.5rem;
align-items: flex-start;
transition: all 0.3s;
animation: fadeInUp 0.3s ease;
}
.activity-item:hover {
border-color: var(--primary-color);
}
.activity-icon {
font-size: 1.2rem;
width: 36px;
height: 36px;
display: flex;
align-items: center;
justify-content: center;
background: var(--bg-dark);
border-radius: 8px;
flex-shrink: 0;
}
.activity-content {
flex: 1;
min-width: 0;
}
.activity-message {
font-size: 0.9rem;
line-height: 1.4;
}
.activity-meta {
font-size: 0.75rem;
color: var(--text-secondary);
margin-top: 0.25rem;
}
.activity-username {
color: var(--primary-color);
font-weight: 500;
}
.activity-empty {
text-align: center;
padding: 3rem;
color: var(--text-secondary);
}
.activity-empty .big-icon {
font-size: 3rem;
margin-bottom: 1rem;
}
.activity-type-icon {
display: inline-block;
margin-right: 0.3rem;
}
@keyframes fadeInUp {
from { opacity: 0; transform: translateY(10px); }
to { opacity: 1; transform: translateY(0); }
}
.activity-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 1.5rem;
}
.live-indicator {
display: flex;
align-items: center;
gap: 0.5rem;
font-size: 0.85rem;
color: var(--success-color);
}
.live-dot {
width: 8px;
height: 8px;
background: var(--success-color);
border-radius: 50%;
animation: pulse 1.5s ease infinite;
}
@keyframes pulse {
0%, 100% { opacity: 1; }
50% { opacity: 0.3; }
}
</style>
</head>
<body>
{% include "_nav.html" %}
<main class="container" style="padding: 2rem 1rem;">
<div class="activity-header">
<div>
<h1>📰 Лента активностей</h1>
<p class="page-subtitle">Что происходит на сервере</p>
</div>
<div class="live-indicator" id="liveIndicator">
<span class="live-dot"></span>
<span>Live</span>
</div>
</div>
<div class="activity-feed" id="activityFeed">
{% if activities %}
{% for a in activities %}
<div class="activity-item" data-activity-id="{{ a.id }}">
<div class="activity-icon">
{% if a.activity_type == 'case_open' %}📦
{% elif a.activity_type == 'contract' %}🔄
{% elif a.activity_type == 'upgrade' %}🆙
{% elif a.activity_type == 'achievement' %}🏆
{% elif a.activity_type == 'crash' %}💥
{% else %}📌{% endif %}
</div>
<div class="activity-content">
<div class="activity-message">{{ a.message }}</div>
<div class="activity-meta">
<a href="/profiles/{{ a.user_id }}" class="activity-username" style="text-decoration:none;">{{ a.username }}</a>
<span>• {{ a.created_at }}</span>
</div>
</div>
</div>
{% endfor %}
{% else %}
<div class="activity-empty">
<div class="big-icon">📭</div>
<h3>Пока нет активностей</h3>
<p>Открой кейс или выполни контракт — это появится здесь в реальном времени!</p>
</div>
{% endif %}
</div>
</main>
<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.on('activity', (data) => {
const act = data.activity;
if (!act) return;
const feed = document.getElementById('activityFeed');
const empty = feed.querySelector('.activity-empty');
if (empty) empty.remove();
const iconMap = {
'case_open': '📦',
'contract': '🔄',
'upgrade': '🆙',
'achievement': '🏆',
'crash': '💥'
};
const item = document.createElement('div');
item.className = 'activity-item';
item.style.animation = 'none';
item.offsetHeight;
item.style.animation = 'fadeInUp 0.3s ease';
item.innerHTML = `
<div class="activity-icon">${iconMap[act.activity_type] || '📌'}</div>
<div class="activity-content">
<div class="activity-message">${act.message}</div>
<div class="activity-meta">
<a href="/profiles/${act.user_id || 0}" class="activity-username" style="text-decoration:none;">${escapeHtml(act.username)}</a>
<span>• только что</span>
</div>
</div>
`;
feed.insertBefore(item, feed.firstChild);
while (feed.children.length > 100) {
feed.removeChild(feed.lastChild);
}
if (act.activity_type === 'achievement') {
SoundManager.achievement();
} else if (act.activity_type === 'crash') {
SoundManager.crashCashout();
}
});
});
async function logout() {
await fetch('/web/api/auth/logout', { method: 'POST' });
window.location.href = '/';
}
</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>
</body>
</html>
+152 -10
View File
@@ -26,6 +26,8 @@
flex-direction: column;
position: sticky; top: 0; height: 100vh;
flex-shrink: 0;
z-index: 50;
transition: transform 0.25s ease;
}
.admin-sidebar .sb-brand {
padding: 1.25rem 1.25rem 0.75rem;
@@ -73,6 +75,28 @@
}
.admin-sidebar .sb-footer a:hover { color: #f59e0b; }
/* ─── Sidebar overlay for mobile ─── */
.sidebar-overlay {
display: none;
position: fixed; inset: 0;
background: rgba(0,0,0,0.5);
z-index: 49;
}
.sidebar-overlay.open { display: block; }
/* ─── Hamburger ─── */
.hamburger {
display: none;
background: none;
border: none;
color: rgba(255,255,255,0.6);
font-size: 1.3rem;
cursor: pointer;
padding: 0.25rem;
line-height: 1;
}
.hamburger:hover { color: #fff; }
/* ─── Main area ─── */
.admin-main {
flex: 1;
@@ -85,8 +109,10 @@
padding: 0.85rem 1.5rem;
background: rgba(17,18,22,0.8);
backdrop-filter: blur(8px);
-webkit-backdrop-filter: blur(8px);
border-bottom: 1px solid rgba(255,255,255,0.04);
position: sticky; top: 0; z-index: 10;
gap: 0.75rem;
}
.admin-topbar .at-title {
font-size: 1rem; font-weight: 600;
@@ -96,7 +122,10 @@
font-size: 0.75rem; color: rgba(255,255,255,0.35);
font-weight: 400;
}
.admin-topbar .at-actions { display: flex; align-items: center; gap: 0.75rem; }
.admin-topbar .at-actions {
display: flex; align-items: center; gap: 0.75rem;
margin-left: auto;
}
.admin-topbar .at-actions .at-back {
color: rgba(255,255,255,0.5); text-decoration: none;
font-size: 0.8rem; display: flex; align-items: center; gap: 0.3rem;
@@ -152,6 +181,7 @@
.a-stat .as-value {
font-size: 1.8rem; font-weight: 700;
line-height: 1.1;
word-break: break-word;
}
.a-stat .as-bar {
position: absolute; bottom: 0; left: 0; height: 2px;
@@ -196,6 +226,11 @@
flex-wrap: wrap;
}
/* ─── Responsive tables: card view on mobile ─── */
.a-table-card-view {
display: none;
}
/* ─── Buttons ─── */
.a-btn {
display: inline-flex; align-items: center; gap: 0.35rem;
@@ -255,6 +290,7 @@
color: rgba(255,255,255,0.5);
margin-bottom: 0.35rem;
}
select.a-input { cursor: pointer; }
/* ─── Badge ─── */
.a-badge {
@@ -272,6 +308,7 @@
.a-overlay {
position: fixed; inset: 0;
background: rgba(0,0,0,0.6); backdrop-filter: blur(4px);
-webkit-backdrop-filter: blur(4px);
z-index: 100; display: none; align-items: center; justify-content: center;
padding: 1rem;
}
@@ -283,13 +320,16 @@
padding: 1.5rem;
max-width: 460px; width: 100%;
box-shadow: 0 20px 60px rgba(0,0,0,0.5);
max-height: 90vh; overflow-y: auto;
}
.a-modal-wide { max-width: 700px; }
.a-modal-title {
font-size: 1rem; font-weight: 600; margin-bottom: 1rem;
}
.a-modal-actions {
display: flex; gap: 0.5rem; margin-top: 1rem;
justify-content: flex-end;
flex-wrap: wrap;
}
/* ─── Grid helpers ─── */
@@ -298,7 +338,14 @@
.a-gap-sm { gap: 0.5rem; }
.a-mt { margin-top: 1rem; }
.a-mb { margin-bottom: 1rem; }
.a-flex { display: flex; align-items: center; gap: 0.5rem; }
.a-flex { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; }
/* ─── Search in top bar ─── */
.search-form {
display: flex; gap: 0.5rem; align-items: center;
}
.search-form .a-input { width: 200px; }
.search-form .a-btn { flex-shrink: 0; }
/* ─── Empty state ─── */
.a-empty {
@@ -307,20 +354,86 @@
}
.a-empty .a-empty-icon { font-size: 2.5rem; margin-bottom: 0.5rem; }
@media(max-width:768px){
.admin-sidebar { width: 56px; }
.admin-sidebar .sb-brand span,
.admin-sidebar .sb-nav a span:not(.sb-icon),
.admin-sidebar .sb-footer span { display: none; }
.admin-sidebar .sb-nav a { justify-content: center; padding: 0.65rem; }
.admin-sidebar .sb-footer a { justify-content: center; }
/* ─── Responsive ─── */
@media(max-width: 1024px){
.admin-sidebar { width: 200px; }
}
@media(max-width: 768px){
.admin-sidebar {
position: fixed; left: 0; top: 0;
transform: translateX(-100%);
width: 260px;
box-shadow: 4px 0 30px rgba(0,0,0,0.4);
}
.admin-sidebar.open { transform: translateX(0); }
.admin-content { padding: 1rem; }
.admin-topbar { padding: 0.7rem 1rem; }
.admin-topbar .at-title .at-sub { display: none; }
.hamburger { display: inline-flex; }
.a-stats {
grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
gap: 0.75rem;
}
.a-stat { padding: 1rem; }
.a-stat .as-value { font-size: 1.4rem; }
.search-form .a-input { width: 140px; }
.a-modal { margin: 0.5rem; padding: 1rem; border-radius: 12px; }
/* Card-style table on mobile */
.a-table { display: none; }
.a-table-card-view { display: flex; flex-direction: column; gap: 0.75rem; }
.a-table-card {
background: rgba(17,18,22,0.6);
border: 1px solid rgba(255,255,255,0.05);
border-radius: 10px;
padding: 0.85rem;
font-size: 0.82rem;
}
.a-table-card .tc-row {
display: flex; justify-content: space-between;
padding: 0.25rem 0;
gap: 0.5rem;
}
.a-table-card .tc-row .tc-label {
color: rgba(255,255,255,0.35);
font-size: 0.72rem;
flex-shrink: 0;
}
.a-table-card .tc-row .tc-value {
text-align: right;
word-break: break-word;
}
.a-table-card .tc-actions {
margin-top: 0.5rem; padding-top: 0.5rem;
border-top: 1px solid rgba(255,255,255,0.04);
display: flex; gap: 0.35rem; flex-wrap: wrap;
}
}
@media(max-width: 480px){
html { font-size: 14px; }
.admin-content { padding: 0.75rem; }
.admin-topbar { padding: 0.6rem 0.75rem; }
.a-stats { grid-template-columns: 1fr 1fr; gap: 0.5rem; }
.a-stat { padding: 0.75rem; }
.a-stat .as-value { font-size: 1.2rem; }
.a-card { padding: 0.85rem; }
.search-form { width: 100%; }
.search-form .a-input { width: 100%; }
}
{% block extra_styles %}{% endblock %}
</style>
</head>
<body>
<div class="admin-sidebar">
<div class="sidebar-overlay" id="sidebarOverlay"></div>
<div class="admin-sidebar" id="adminSidebar">
<div class="sb-brand">
<span style="font-size:1.2rem"></span>
<span>CS2 <span>Admin</span></span>
@@ -344,6 +457,7 @@
<div class="admin-main">
<div class="admin-topbar">
<div class="at-title">
<button class="hamburger" id="hamburgerBtn" aria-label="Toggle menu"></button>
{% block page_title %}Панель управления{% endblock %}
</div>
<div class="at-actions">
@@ -357,6 +471,34 @@
{% block modals %}{% endblock %}
<script src="/static/js/notifications.js"></script>
<script>
(function() {
const sidebar = document.getElementById('adminSidebar');
const overlay = document.getElementById('sidebarOverlay');
const hamburger = document.getElementById('hamburgerBtn');
function toggleSidebar() {
sidebar.classList.toggle('open');
overlay.classList.toggle('open');
}
if (hamburger) {
hamburger.addEventListener('click', toggleSidebar);
}
if (overlay) {
overlay.addEventListener('click', toggleSidebar);
}
// Auto-close sidebar on nav click (mobile)
sidebar.querySelectorAll('.sb-nav a').forEach(function(link) {
link.addEventListener('click', function() {
if (window.innerWidth <= 768) {
toggleSidebar();
}
});
});
})();
</script>
{% block scripts %}{% endblock %}
</body>
</html>
+266 -99
View File
@@ -53,6 +53,32 @@
{% endfor %}
</tbody>
</table>
<div class="a-table-card-view">
{% for c in cases %}
<div class="a-table-card">
<div class="tc-row">
<span class="tc-label">Название</span>
<span class="tc-value"><strong>{{ c.name }}</strong></span>
</div>
<div class="tc-row">
<span class="tc-label">Цена</span>
<span class="tc-value">{{ c.price_open }} ₽</span>
</div>
<div class="tc-row">
<span class="tc-label">Тип</span>
<span class="tc-value">{{ c.display_name|default('') }}</span>
</div>
<div class="tc-row">
<span class="tc-label">Предметов</span>
<span class="tc-value">{{ c.items_count }}</span>
</div>
<div class="tc-actions">
<button class="a-btn a-btn-sm" onclick="openEditCaseModal('{{ c.name }}')">✏️ Редактировать</button>
<button class="a-btn a-btn-danger a-btn-sm" onclick="deleteCase('{{ c.name }}')">🗑️</button>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endblock %}
@@ -60,57 +86,90 @@
{% block modals %}
<!-- Create/Edit Case Modal -->
<div class="a-overlay" id="caseModal">
<div class="a-modal" style="max-width:600px">
<div class="a-modal a-modal-wide" style="max-height:95vh;display:flex;flex-direction:column">
<div class="a-modal-title" id="caseModalTitle">🎲 Создать кейс</div>
<input type="hidden" id="editCaseName">
<div class="a-row a-gap-sm">
<div class="a-mb" style="flex:1">
<label class="a-label">Название кейса (ID)</label>
<input type="text" id="caseNameInput" class="a-input" placeholder="my_case">
<div style="padding:0 1.5rem;flex:1;overflow-y:auto">
<div class="a-row a-gap-sm">
<div class="a-mb" style="flex:1">
<label class="a-label">Название кейса (ID)</label>
<input type="text" id="caseNameInput" class="a-input" placeholder="my_case">
</div>
<div class="a-mb" style="flex:1">
<label class="a-label">Отображаемое название</label>
<input type="text" id="caseDisplayName" class="a-input" placeholder="Мой кейс">
</div>
</div>
<div class="a-mb" style="flex:1">
<label class="a-label">Отображаемое название</label>
<input type="text" id="caseDisplayName" class="a-input" placeholder="Мой кейс">
<div class="a-row a-gap-sm">
<div class="a-mb" style="flex:1">
<label class="a-label">Цена открытия</label>
<input type="number" id="casePrice" class="a-input" value="250">
</div>
<div class="a-mb" style="flex:1">
<label class="a-label">Ссылка на изображение</label>
<input type="text" id="caseImage" class="a-input" placeholder="/static/cases/default.png">
</div>
</div>
<div class="a-mb">
<label class="a-label">Описание (необязательно)</label>
<input type="text" id="caseDescription" class="a-input" placeholder="Описание кейса...">
</div>
<!-- Item browser section -->
<div class="a-card" style="background:rgba(0,0,0,0.2);padding:0.75rem;margin-bottom:1rem">
<div class="a-card-header" style="margin-bottom:0.5rem">📋 Предметы кейса <span id="itemCount" style="font-size:0.75rem;color:rgba(255,255,255,0.4)">(0)</span></div>
<!-- Selected items list -->
<div id="caseItemsList" style="max-height:200px;overflow-y:auto;margin-bottom:0.75rem"></div>
<!-- Search + filters + add controls -->
<div class="a-row a-gap-sm" style="margin-bottom:0.5rem">
<input type="text" id="caseItemSearch" class="a-input a-input-sm" style="flex:2;min-width:120px" placeholder="🔍 Поиск..." oninput="searchCaseItems()">
<select id="rarityFilter" class="a-input a-input-sm" style="flex:1;min-width:90px" onchange="searchCaseItems()">
<option value="">Редкость</option>
<option value="Consumer Grade">Consumer</option>
<option value="Industrial Grade">Industrial</option>
<option value="Mil-Spec">Mil-Spec</option>
<option value="Restricted">Restricted</option>
<option value="Classified">Classified</option>
<option value="Covert">Covert</option>
<option value="Rare Special Item">Rare Special</option>
<option value="Contraband">Contraband</option>
</select>
<select id="collectionFilter" class="a-input a-input-sm" style="flex:1.2;min-width:100px" onchange="searchCaseItems()">
<option value="">Коллекция</option>
</select>
<select id="sortBy" class="a-input a-input-sm" style="flex:0.7;min-width:80px" onchange="searchCaseItems()">
<option value="">Сортировка</option>
<option value="price_rub">Цена ↑</option>
<option value="price_rub&desc">Цена ↓</option>
<option value="name">Имя ↑</option>
<option value="rarity">Редкость ↑</option>
<option value="rarity&desc">Редкость ↓</option>
</select>
</div>
<div class="a-row a-gap-sm" style="margin-bottom:0.5rem">
<select id="typeFilter" class="a-input a-input-sm" style="flex:1;min-width:70px" onchange="searchCaseItems()">
<option value="">Тип</option>
</select>
<select id="weaponFilter" class="a-input a-input-sm" style="flex:1;min-width:80px" onchange="searchCaseItems()">
<option value="">Оружие</option>
</select>
<input type="number" id="minPrice" class="a-input a-input-sm" style="flex:0.6;min-width:60px" placeholder="Цена от" oninput="searchCaseItems()" value="0">
<input type="number" id="maxPrice" class="a-input a-input-sm" style="flex:0.6;min-width:60px" placeholder="Цена до" oninput="searchCaseItems()" value="0">
</div>
<!-- Search results -->
<div id="caseItemResults" style="max-height:220px;overflow-y:auto;border:1px solid rgba(255,255,255,0.06);border-radius:6px;padding:0.25rem"></div>
</div>
</div>
<div class="a-row a-gap-sm">
<div class="a-mb" style="flex:1">
<label class="a-label">Цена открытия</label>
<input type="number" id="casePrice" class="a-input" value="250">
</div>
<div class="a-mb" style="flex:1">
<label class="a-label">Ссылка на изображение</label>
<input type="text" id="caseImage" class="a-input" placeholder="/static/cases/default.png">
</div>
</div>
<div class="a-mb">
<label class="a-label">Описание (необязательно)</label>
<input type="text" id="caseDescription" class="a-input" placeholder="Описание кейса...">
</div>
<div class="a-card" style="background:rgba(0,0,0,0.2);padding:0.75rem">
<div class="a-card-header" style="margin-bottom:0.5rem">📋 Предметы кейса</div>
<div id="caseItemsList"></div>
<div class="a-flex a-mt" style="flex-wrap:wrap">
<input type="text" id="caseItemSearch" class="a-input a-input-sm" style="flex:1;min-width:120px" placeholder="Поиск предмета..." oninput="searchCaseItems()">
<button class="a-btn a-btn-sm" onclick="openAllItemsModal()">📦 Все предметы</button>
</div>
</div>
<div class="a-modal-actions">
<div class="a-modal-actions" style="padding:0.75rem 1.5rem;border-top:1px solid rgba(255,255,255,0.06)">
<button class="a-btn" onclick="closeModal('caseModal')">Отмена</button>
<button class="a-btn a-btn-primary" id="saveCaseBtn" onclick="saveCase()">💾 Сохранить</button>
</div>
</div>
</div>
<!-- All items browser modal -->
<div class="a-overlay" id="allItemsModal">
<div class="a-modal" style="max-width:700px;max-height:80vh;display:flex;flex-direction:column">
<div class="a-modal-title">📦 Все предметы</div>
<input type="text" id="allItemsSearch" class="a-input a-input-sm a-mb" placeholder="Поиск..." oninput="searchAllItems()">
<div id="allItemsGrid" style="flex:1;overflow-y:auto;display:grid;grid-template-columns:repeat(auto-fill,minmax(140px,1fr));gap:0.5rem"></div>
</div>
</div>
<!-- Add case to section modal -->
<div class="a-overlay" id="addCaseModal">
<div class="a-modal" style="max-width:400px">
@@ -145,13 +204,26 @@
{% block extra_styles %}
<style>
.ci-item { display:flex; align-items:center; gap:0.5rem; padding:0.35rem 0; border-bottom:1px solid rgba(255,255,255,0.03); font-size:0.78rem; }
.ci-item img { width:32px; height:24px; object-fit:contain; }
.ci-item .ci-info { flex:1; }
.ci-item {
display:flex; align-items:center; gap:0.5rem;
padding:0.3rem 0.5rem; border-bottom:1px solid rgba(255,255,255,0.04);
font-size:0.78rem; transition:background 0.15s;
}
.ci-item:hover { background:rgba(255,255,255,0.03); }
.ci-item img { width:36px; height:28px; object-fit:contain; border-radius:3px; }
.ci-item .ci-info { flex:1; line-height:1.3; }
.ci-item .ci-rarity { font-size:0.65rem; color:rgba(255,255,255,0.35); }
.all-item-card { background:rgba(0,0,0,0.15); border-radius:6px; padding:0.35rem; cursor:pointer; text-align:center; font-size:0.7rem; transition:all 0.15s; border:1px solid transparent; }
.all-item-card:hover { border-color:rgba(245,158,11,0.3); background:rgba(245,158,11,0.05); }
.all-item-card img { width:100%; height:40px; object-fit:contain; }
.ci-result {
display:flex; align-items:center; gap:0.5rem;
padding:0.3rem 0.5rem; cursor:pointer;
border-bottom:1px solid rgba(255,255,255,0.03);
font-size:0.78rem; transition:all 0.12s; border-radius:3px;
}
.ci-result:hover { background:rgba(245,158,11,0.08); }
.ci-result img { width:36px; height:28px; object-fit:contain; border-radius:3px; }
.ci-result .ci-info { flex:1; line-height:1.3; }
.ci-result .ci-meta { font-size:0.65rem; color:rgba(255,255,255,0.35); }
.ci-result .ci-add { font-size:0.7rem; color:#f59e0b; }
</style>
{% endblock %}
@@ -159,17 +231,42 @@
<script>
let currentCaseItems = [];
let editingCaseName = null;
let searchDebounce = null;
// ─── Modals ──────────────────────────────────────────────────────────────────
function closeModal(id) { document.getElementById(id).classList.remove('open'); }
function openModal(id) { document.getElementById(id).classList.add('open'); }
// ─── Load page data ──────────────────────────────────────────────────────────
let allCasesList = [];
// ─── Load filter options ─────────────────────────────────────────────────────
document.addEventListener('DOMContentLoaded', async () => {
const r = await fetch('/admin/api/cases/list');
const d = await r.json();
allCasesList = d.cases || [];
allCasesList = await r.json();
// Load collections
const cr = await fetch('/admin/api/collections');
const cd = await cr.json();
const colSel = document.getElementById('collectionFilter');
(cd.collections || []).forEach(c => {
const o = document.createElement('option');
o.value = c; o.textContent = c;
colSel.appendChild(o);
});
// Load weapons + types
const fr = await fetch('/admin/api/items/filters');
const fd = await fr.json();
const typeSel = document.getElementById('typeFilter');
(fd.types || []).forEach(t => {
const o = document.createElement('option');
o.value = t; o.textContent = t;
typeSel.appendChild(o);
});
const weaponSel = document.getElementById('weaponFilter');
(fd.weapons || []).forEach(w => {
const o = document.createElement('option');
o.value = w; o.textContent = w;
weaponSel.appendChild(o);
});
});
// ─── Create / Edit Case ──────────────────────────────────────────────────────
@@ -185,6 +282,8 @@ function openCreateCaseModal() {
document.getElementById('caseDescription').value = '';
currentCaseItems = [];
renderCaseItems();
document.getElementById('caseItemSearch').value = '';
document.getElementById('caseItemResults').innerHTML = '';
openModal('caseModal');
}
@@ -200,21 +299,34 @@ function openEditCaseModal(caseName) {
document.getElementById('casePrice').value = c.price_open || 250;
document.getElementById('caseImage').value = c.image_url || '';
document.getElementById('caseDescription').value = c.description || '';
currentCaseItems = (c.items || []).filter(i => typeof i === 'object');
currentCaseItems = (c.items || []).filter(i => typeof i === 'object').map(i => {
if (typeof i.id === 'number' && !i.market_hash_name) {
return { id: i.id, name: i.name || 'Item #' + i.id, market_hash_name: i.name || '' };
}
return i;
});
renderCaseItems();
document.getElementById('caseItemSearch').value = '';
document.getElementById('caseItemResults').innerHTML = '';
openModal('caseModal');
}
function renderCaseItems() {
const div = document.getElementById('caseItemsList');
const count = currentCaseItems.length;
document.getElementById('itemCount').textContent = `(${count})`;
if (count === 0) {
div.innerHTML = '<div style="font-size:0.75rem;color:rgba(255,255,255,0.3);padding:0.5rem 0">Нет предметов — добавьте через поиск выше</div>';
return;
}
div.innerHTML = currentCaseItems.map((item, i) => `
<div class="ci-item">
<div class="ci-item" onclick="removeCaseItem(${i})" style="cursor:pointer">
<img src="${item.image_url || '/static/placeholder.png'}" onerror="this.src='/static/placeholder.png'">
<div class="ci-info">
<div>${item.market_hash_name || item.name || '???'}</div>
<div class="ci-rarity">${item.rarity || ''}${item.weapon || ''}</div>
<div class="ci-rarity">${item.rarity || ''}${item.collection ? ' • ' + item.collection : ''}</div>
</div>
<button class="a-btn a-btn-danger a-btn-sm" onclick="removeCaseItem(${i})">✕</button>
<span style="font-size:0.65rem;color:#ef4444;opacity:0.6">✕</span>
</div>
`).join('');
}
@@ -225,31 +337,105 @@ function removeCaseItem(idx) {
}
function addCaseItem(item) {
if (currentCaseItems.some(i => (i.market_hash_name || i.name) === (item.market_hash_name || item.name))) return;
const key = (item.market_hash_name || item.name || '');
if (currentCaseItems.some(i => (i.market_hash_name || i.name) === key)) return;
currentCaseItems.push(item);
renderCaseItems();
}
function addAllFromCollection() {
const sel = document.getElementById('collectionFilter');
const coll = sel.value;
if (!coll) { Notify.error('Выберите коллекцию'); return; }
const rarity = document.getElementById('rarityFilter').value;
const typeF = document.getElementById('typeFilter').value;
const weaponF = document.getElementById('weaponFilter').value;
let url = `/admin/api/items/by-collection?collection=${encodeURIComponent(coll)}`;
if (rarity) url += `&rarity_filter=${encodeURIComponent(rarity)}`;
if (typeF) url += `&type_filter=${encodeURIComponent(typeF)}`;
if (weaponF) url += `&weapon_filter=${encodeURIComponent(weaponF)}`;
fetch(url)
.then(r => r.json())
.then(items => {
let added = 0;
let skipped = 0;
const alreadyIds = new Set(currentCaseItems.map(i => i.id));
items.forEach(item => {
if (alreadyIds.has(item.id)) {
skipped++;
return;
}
const key = (item.name || '');
if (!currentCaseItems.some(i => (i.market_hash_name || i.name) === key)) {
currentCaseItems.push(item);
added++;
}
});
renderCaseItems();
let msg = `Добавлено ${added} предметов из "${coll}"`;
if (skipped) msg += ` (${skipped} уже были в кейсе)`;
Notify.success(msg);
});
}
async function searchCaseItems() {
const q = document.getElementById('caseItemSearch').value;
if (q.length < 2) return;
const r = await fetch(`/admin/api/items/search?q=${encodeURIComponent(q)}`);
const items = await r.json();
// show as dropdown
let html = '<div style="margin-top:0.5rem;max-height:200px;overflow-y:auto">';
items.forEach(item => {
html += `<div class="ci-item" style="cursor:pointer" onclick="addCaseItem(${JSON.stringify(item).replace(/"/g,'&quot;')})">
<img src="${item.image_url || '/static/placeholder.png'}" onerror="this.src='/static/placeholder.png'">
<div class="ci-info"><div>${item.name}</div><div class="ci-rarity">${item.rarity}${item.price_rub||0} ₽</div></div>
</div>`;
});
html += '</div>';
const existing = document.getElementById('caseItemSearchResults');
if (!existing) {
const d = document.createElement('div'); d.id = 'caseItemSearchResults';
document.getElementById('caseItemSearch').parentNode.appendChild(d);
}
document.getElementById('caseItemSearchResults').innerHTML = html;
const rarity = document.getElementById('rarityFilter').value;
const collection = document.getElementById('collectionFilter').value;
const typeF = document.getElementById('typeFilter').value;
const weaponF = document.getElementById('weaponFilter').value;
const minP = document.getElementById('minPrice').value;
const maxP = document.getElementById('maxPrice').value;
const sortV = document.getElementById('sortBy').value;
clearTimeout(searchDebounce);
searchDebounce = setTimeout(async () => {
const params = new URLSearchParams();
if (q.length >= 2) params.set('q', q);
if (rarity) params.set('rarity_filter', rarity);
if (collection) params.set('collection_filter', collection);
if (typeF) params.set('type_filter', typeF);
if (weaponF) params.set('weapon_filter', weaponF);
if (minP > 0) params.set('min_price', minP);
if (maxP > 0) params.set('max_price', maxP);
if (sortV) {
const [field, order] = sortV.split('&');
params.set('sort_by', field);
if (order) params.set('sort_order', 'desc');
}
params.set('limit', '100');
const r = await fetch(`/admin/api/items/search?${params.toString()}`);
const items = await r.json();
const div = document.getElementById('caseItemResults');
if (items.length === 0) {
div.innerHTML = '<div style="font-size:0.75rem;color:rgba(255,255,255,0.3);padding:0.5rem">Ничего не найдено</div>';
return;
}
let html = '';
if (collection) {
html += `<div style="padding:0.3rem 0.5rem;font-size:0.7rem;color:rgba(255,255,255,0.4);display:flex;justify-content:space-between">
<span>Найдено: ${items.length} предметов</span>
<span onclick="addAllFromCollection()" style="cursor:pointer;color:#f59e0b"> Добавить все из коллекции</span>
</div>`;
}
const alreadyIds = new Set(currentCaseItems.map(i => i.id));
html += items.filter(item => !alreadyIds.has(item.id)).map(item => {
const priceStr = item.price_rub > 0 ? item.price_rub.toLocaleString('ru') + '₽' : '';
return `
<div class="ci-result" onclick="addCaseItem(${JSON.stringify(item).replace(/"/g,'&quot;')})">
<img src="${item.image_url || '/static/placeholder.png'}" onerror="this.src='/static/placeholder.png'">
<div class="ci-info">
<div>${item.name}</div>
<div class="ci-meta">${item.rarity}${item.weapon ? ' • ' + item.weapon : ''}${priceStr ? ' • ' + priceStr : ''}</div>
</div>
<div class="ci-add">+</div>
</div>`;
}).join('');
const hidden = items.filter(item => alreadyIds.has(item.id)).length;
if (hidden > 0) {
html += `<div style="font-size:0.65rem;color:rgba(255,255,255,0.25);padding:0.3rem 0.5rem">${hidden} предмет(ов) уже в кейсе</div>`;
}
div.innerHTML = html;
}, q.length >= 2 ? 200 : 300);
}
async function saveCase() {
@@ -263,11 +449,15 @@ async function saveCase() {
fd.append('description', document.getElementById('caseDescription').value);
fd.append('items_json', JSON.stringify(currentCaseItems));
const isEdit = editingCaseName !== null && editingCaseName !== name;
const isEdit = editingCaseName !== null;
const url = isEdit
? `/admin/api/cases/update/${encodeURIComponent(editingCaseName)}`
: '/admin/api/cases/create';
if (isEdit && editingCaseName !== name) {
fd.append('new_name', name);
}
const r = await fetch(url, { method:'POST', body:fd });
const d = await r.json();
if (d.success) { window.location.reload(); }
@@ -285,29 +475,6 @@ async function deleteCase(name) {
});
}
// ─── All Items Browser ───────────────────────────────────────────────────────
async function openAllItemsModal() {
openModal('allItemsModal');
document.getElementById('allItemsSearch').value = '';
await searchAllItems();
}
async function searchAllItems() {
const q = document.getElementById('allItemsSearch').value;
const r = await fetch(`/admin/api/items/search?q=${encodeURIComponent(q)}&limit=200`);
const items = await r.json();
document.getElementById('allItemsGrid').innerHTML = items.map(item => `
<div class="all-item-card" onclick="addCaseItemFromAll(${JSON.stringify(item).replace(/"/g,'&quot;')})">
<img src="${item.image_url || '/static/placeholder.png'}" onerror="this.src='/static/placeholder.png'">
<div style="margin-top:0.2rem;line-height:1.15">${item.name}</div>
<div style="font-size:0.6rem;color:rgba(255,255,255,0.35)">${item.rarity}</div>
</div>
`).join('');
}
function addCaseItemFromAll(item) {
addCaseItem(item);
closeModal('allItemsModal');
}
// ─── Mainpage Sections ───────────────────────────────────────────────────────
function openAddSectionModal() {
document.getElementById('newSectionName').value = '';
@@ -336,7 +503,7 @@ async function deleteSection(tab) {
function openAddCaseModal(tab) {
document.getElementById('addCaseSectionName').textContent = tab;
const sel = document.getElementById('addCaseSelect');
sel.innerHTML = allCasesList.map(c => `<option value="${c}">${c}</option>`).join('');
sel.innerHTML = allCasesList.map(c => `<option value="${c.name}">${c.display_name || c.name}</option>`).join('');
sel.dataset.tab = tab;
openModal('addCaseModal');
}
+27
View File
@@ -4,6 +4,13 @@
{% block page_title %}📊 Дашборд{% endblock %}
{% block content %}
<div class="a-card" style="margin-bottom:1rem;padding:0.75rem">
<div style="display:flex;justify-content:space-between;align-items:center">
<strong>🎭 Промо-фаза:</strong>
<span id="promoPhaseInfo">Загрузка...</span>
</div>
</div>
<div class="a-stats">
<div class="a-stat">
<div class="as-label">Пользователей</div>
@@ -55,3 +62,23 @@
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
async function loadPromoPhase() {
try {
const r = await fetch('/admin/api/promo-phase');
const d = await r.json();
const el = document.getElementById('promoPhaseInfo');
if (d.current_phase === 'LUCKY') {
el.innerHTML = '<span style="color:#22c55e">🍀 LUCKY</span> (осталось ' + Math.floor(d.remaining_seconds / 60) + ' мин)';
} else if (d.current_phase === 'UNLUCKY') {
el.innerHTML = '<span style="color:#ef4444">💀 UNLUCKY</span> (осталось ' + Math.floor(d.remaining_seconds / 60) + ' мин)';
} else {
el.innerHTML = '<span style="color:#a3a3a3">⚪ NEUTRAL</span> (осталось ' + Math.floor(d.remaining_seconds / 60) + ' мин)';
}
} catch(e) {}
}
document.addEventListener('DOMContentLoaded', loadPromoPhase);
</script>
{% endblock %}
+61 -1
View File
@@ -8,10 +8,11 @@
{% endblock %}
{% block top_actions %}
<a href="/admin/users" class="at-back">&larr; Назад</a>
<a href="/admin/user/{{ target_user.id }}/history" class="a-btn" style="margin-left:0.5rem;font-size:0.82rem;">📜 История</a>
{% endblock %}
{% block content %}
<div class="a-stats" style="grid-template-columns:repeat(4,1fr)">
<div class="a-stats">
<div class="a-stat">
<div class="as-label">Баланс</div>
<div class="as-value">{{ target_user.balance|money }} ₽</div>
@@ -49,6 +50,26 @@
</div>
</div>
<!-- RPU v2 -->
<div class="a-card">
<div class="a-card-header">🎲 RPU v2 — подробно</div>
<div id="rpuV2Stats" class="a-mb" style="font-size:0.82rem">
<div class="a-row a-gap-sm" style="justify-content:space-around;text-align:center;margin-bottom:0.75rem">
<div><div class="as-value" id="v2Ceiling" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Потолок / Депнуто</div></div>
<div><div class="as-value" id="v2Budget" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Luck Budget</div></div>
<div><div class="as-value" id="v2SessionSpent" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Сессия потрачено</div></div>
<div><div class="as-value" id="v2HotScore" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Hot Score</div></div>
<div><div class="as-value" id="v2PromoPhase" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Промо-фаза</div></div>
</div>
<div class="a-row a-gap-sm" style="justify-content:space-around;text-align:center">
<div><div class="as-value" id="v2Comeback" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Комбек</div></div>
<div><div class="as-value" id="v2BreakCount" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Пробитий</div></div>
<div><div class="as-value" id="v2LossStreak" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Проигрышей подряд</div></div>
<div><div class="as-value" id="v2SessionReset" style="font-size:1.1rem">--</div><div class="as-label" style="font-size:0.65rem">Сброс сессии</div></div>
</div>
</div>
</div>
<!-- Действия -->
<div class="a-card">
<div class="a-card-header">🔧 Действия</div>
@@ -84,6 +105,27 @@
{% endfor %}
</tbody>
</table>
<div class="a-table-card-view">
{% for item in inventory %}
<div class="a-table-card">
<div class="tc-row">
<span class="tc-label">ID</span>
<span class="tc-value">{{ item.id }}</span>
</div>
<div class="tc-row">
<span class="tc-label">Название</span>
<span class="tc-value">{{ item.market_hash_name[:40] }}{{'…' if item.market_hash_name|length > 40}}</span>
</div>
<div class="tc-row">
<span class="tc-label">Редкость / Float</span>
<span class="tc-value">{{ item.rarity }} / {{ "%.4f"|format(item.float_value) }}</span>
</div>
<div class="tc-actions">
<button class="a-btn a-btn-danger a-btn-sm" onclick="deleteItem({{ item.id }})">🗑️ Удалить</button>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endblock %}
@@ -251,6 +293,24 @@ async function loadRPU() {
document.getElementById('rpuSpent').textContent = Math.round(d.stats.total_spent).toLocaleString() + ' ₽';
document.getElementById('rpuOpened').textContent = d.stats.total_opened.toLocaleString();
document.getElementById('rpuAutoStatus').textContent = d.auto_adjust ? '✅' : '❌';
// ── RPU v2 ──
if (d.v2) {
const v = d.v2;
document.getElementById('v2Ceiling').textContent = Math.round(v.ceiling.current_ceiling).toLocaleString('ru') + '₽ / ' + Math.round(v.ceiling.total_deposited).toLocaleString('ru') + '₽';
document.getElementById('v2Budget').textContent = v.session.luck_budget + '%';
document.getElementById('v2Budget').style.color = v.session.luck_budget < 30 ? '#ef4444' : v.session.luck_budget > 70 ? '#22c55e' : '#f59e0b';
document.getElementById('v2SessionSpent').textContent = Math.round(v.session.session_spent).toLocaleString('ru') + '₽';
document.getElementById('v2HotScore').textContent = v.hot_cold.hot_score;
document.getElementById('v2HotScore').style.color = v.hot_cold.hot_score > 0.5 ? '#22c55e' : v.hot_cold.hot_score < -0.5 ? '#ef4444' : '#f59e0b';
const ph = v.promo_phase;
document.getElementById('v2PromoPhase').textContent = ph.phase;
document.getElementById('v2PromoPhase').style.color = ph.phase === 'LUCKY' ? '#22c55e' : ph.phase === 'UNLUCKY' ? '#ef4444' : '#f59e0b';
document.getElementById('v2Comeback').textContent = v.comeback.active ? '✅ x' + v.comeback.multiplier.toFixed(1) + ' (' + v.comeback.openings_left + ')' : '❌';
document.getElementById('v2BreakCount').textContent = v.ceiling.break_count + ' (' + v.ceiling.break_session + ' сесс)';
document.getElementById('v2LossStreak').textContent = v.comeback.consecutive_loss_count + ' (' + Math.round(v.comeback.consecutive_loss_value).toLocaleString('ru') + '₽)';
document.getElementById('v2SessionReset').textContent = v.session.reset_date ? new Date(v.session.reset_date).toLocaleString('ru') : '—';
}
} catch(_) {}
}
+122
View File
@@ -0,0 +1,122 @@
{% extends "admin/base.html" %}
{% block title %}История {{ target_user.username }} — Админ-панель{% endblock %}
{% block nav_users %}active{% endblock %}
{% block page_title %}
📜 История {{ target_user.username }}
<span class="at-sub">ID {{ target_user.id }}</span>
{% endblock %}
{% block top_actions %}
<a href="/admin/user/{{ target_user.id }}" class="at-back">&larr; Профиль</a>
{% endblock %}
{% block extra_styles %}
<style>
.rarity-Covert, .rarity-Rare\ Special\ Item, .rarity-Extraordinary { color: #eb4b4b; }
.rarity-Classified { color: #d32ce6; }
.rarity-Restricted { color: #8847ff; }
.rarity-Mil-Spec, .rarity-Mil-Spec\ Grade { color: #4b69ff; }
.rarity-Industrial\ Grade { color: #5e98d9; }
.rarity-Consumer\ Grade { color: #b0b0b0; }
.mono { font-family: monospace; font-size: 0.72rem; }
</style>
{% endblock %}
{% block content %}
<div class="a-stats" style="margin-bottom:1rem">
<div class="a-stat"><div class="as-label">Потолок</div><div class="as-value">{{ "%.0f"|format(ceiling) }} ₽</div></div>
<div class="a-stat"><div class="as-label">Текущая ценность</div><div class="as-value">{{ "%.0f"|format(total_value) }} ₽</div></div>
<div class="a-stat"><div class="as-label">Luck budget</div><div class="as-value">{{ "%.1f"|format(rpu.luck_budget) }}%</div></div>
<div class="a-stat"><div class="as-label">Hot score</div><div class="as-value">{{ "%.0f"|format(rpu.hot_score or 0) }}</div></div>
<div class="a-stat"><div class="as-label">Ceiling mult</div><div class="as-value">{{ "%.2f"|format(rpu.ceiling_multiplier) }}</div></div>
<div class="a-stat"><div class="as-label">Комбек</div><div class="as-value">{{ rpu.comeback_active }}</div></div>
</div>
<div class="a-flex a-mb" style="gap:0.5rem">
<button class="a-btn a-btn-primary tab-btn active" onclick="switchTab('openings')">📦 Открытия ({{ openings|length }})</button>
<button class="a-btn tab-btn" onclick="switchTab('upgrades')">⬆️ Апгрейды ({{ upgrades|length }})</button>
<button class="a-btn tab-btn" onclick="switchTab('transactions')">💳 Транзакции ({{ transactions|length }})</button>
</div>
<div id="tab-openings" class="tab-content" style="display:block">
<div class="a-table-wrap">
<table class="a-table">
<thead><tr><th>ID</th><th>Дата</th><th>Кейс</th><th>Предмет</th><th>Редкость</th><th>Float</th></tr></thead>
<tbody>
{% for o in openings %}
<tr>
<td class="mono">{{ o.id }}</td>
<td>{{ o.opened_at.strftime('%d.%m %H:%M') }}</td>
<td>{{ o.case_name }}</td>
<td>{{ o.item_name }}</td>
<td><span class="rarity-{{ o.rarity|replace(' ', '\\ ') }}">{{ o.rarity }}</span></td>
<td>{{ "%.4f"|format(o.float_value) if o.float_value else '—' }}</td>
</tr>
{% else %}
<tr><td colspan="6" class="a-empty" style="padding:2rem">Нет открытий</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div id="tab-upgrades" class="tab-content" style="display:none">
<div class="a-table-wrap">
<table class="a-table">
<thead><tr><th>ID</th><th>Дата</th><th>Вход</th><th>Цель</th><th>Результат</th><th>Базовый шанс</th><th>RPU шанс</th></tr></thead>
<tbody>
{% for u in upgrades %}
<tr>
<td class="mono">{{ u.id }}</td>
<td>{{ u.created_at.strftime('%d.%m %H:%M') }}</td>
<td>{{ u.input_item_name }}</td>
<td>{{ u.target_item_name }}</td>
<td style="color:{% if u.success %}#22c55e{% else %}#ef4444{% endif %}">{% if u.success %}✅ Успех{% else %}❌ Провал{% endif %}</td>
<td>{{ "%.1f"|format(u.probability * 100 if u.probability else 0) }}%</td>
<td>{{ "%.1f"|format(u.rpu_adjusted_probability * 100 if u.rpu_adjusted_probability else 0) }}%</td>
</tr>
{% else %}
<tr><td colspan="7" class="a-empty" style="padding:2rem">Нет апгрейдов</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div id="tab-transactions" class="tab-content" style="display:none">
<div class="a-table-wrap">
<table class="a-table">
<thead><tr><th>ID</th><th>Дата</th><th>Тип</th><th>Сумма</th><th>Комиссия</th><th>Детали</th></tr></thead>
<tbody>
{% for t in transactions %}
<tr>
<td class="mono">{{ t.id }}</td>
<td>{{ t.created_at.strftime('%d.%m %H:%M') }}</td>
<td>
{% if t.tx_type == 'card_to_site' %}<span class="a-badge a-badge-success">Депозит</span>
{% elif t.tx_type == 'site_to_card' %}<span class="a-badge a-badge-banned">Вывод</span>
{% elif t.tx_type == 'promo_bonus' %}<span class="a-badge" style="background:rgba(234,179,8,0.12);color:#eab308">Промо</span>
{% else %}<span class="a-badge a-badge-user">{{ t.tx_type }}</span>{% endif %}
</td>
<td>{{ "%.0f"|format(t.amount) }} ₽</td>
<td>{% if t.fee %}{{ "%.0f"|format(t.fee) }} ₽{% else %}—{% endif %}</td>
<td style="max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">{{ t.details or '' }}</td>
</tr>
{% else %}
<tr><td colspan="6" class="a-empty" style="padding:2rem">Нет транзакций</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
function switchTab(name) {
document.querySelectorAll('.tab-content').forEach(el => el.style.display = 'none');
document.querySelectorAll('.tab-btn').forEach(el => el.classList.remove('active'));
document.getElementById('tab-' + name).style.display = 'block';
document.querySelector('.tab-btn[onclick="switchTab(\'' + name + '\')"]').classList.add('active');
}
</script>
{% endblock %}
+36 -2
View File
@@ -3,8 +3,8 @@
{% block nav_users %}active{% endblock %}
{% block page_title %}👥 Пользователи{% endblock %}
{% block top_actions %}
<div class="a-flex">
<input type="text" id="userSearch" class="a-input a-input-sm" style="width:200px" placeholder="Поиск по имени..." value="{{ search or '' }}">
<div class="search-form a-flex">
<input type="text" id="userSearch" class="a-input a-input-sm" placeholder="Поиск по имени..." value="{{ search or '' }}">
<button class="a-btn a-btn-primary" onclick="searchUsers()">🔍 Найти</button>
</div>
{% endblock %}
@@ -50,6 +50,40 @@
{% endfor %}
</tbody>
</table>
<div class="a-table-card-view">
{% for u in users %}
<div class="a-table-card">
<div class="tc-row">
<span class="tc-label">ID</span>
<span class="tc-value">{{ u.id }}</span>
</div>
<div class="tc-row">
<span class="tc-label">Имя</span>
<span class="tc-value"><a href="/admin/user/{{ u.id }}" style="color:#f59e0b;text-decoration:none;font-weight:500">{{ u.username }}</a></span>
</div>
<div class="tc-row">
<span class="tc-label">Баланс</span>
<span class="tc-value">{{ u.balance|money }} ₽</span>
</div>
<div class="tc-row">
<span class="tc-label">Статус</span>
<span class="tc-value">
{% if u.is_admin %}<span class="a-badge a-badge-admin">Админ</span>{% endif %}
{% if u.is_banned %}<span class="a-badge a-badge-banned">Забанен</span>{% endif %}
{% if not u.is_admin and not u.is_banned %}<span class="a-badge a-badge-user">Игрок</span>{% endif %}
</span>
</div>
<div class="tc-row">
<span class="tc-label">Кейсов / Контр / Предм</span>
<span class="tc-value">{{ u.case_openings }} / {{ u.contracts }} / {{ u.inventory_count }}</span>
</div>
<div class="tc-actions">
<a href="/admin/user/{{ u.id }}" class="a-btn a-btn-sm">✏️ Редактировать</a>
</div>
</div>
{% endfor %}
</div>
</div>
{% else %}
<div class="a-empty">
+29 -10
View File
@@ -519,9 +519,10 @@
const data = await response.json();
if (data.success) {
userBalance = data.balance;
document.querySelectorAll('.user-balance').forEach(el => {
el.textContent = `${Math.floor(data.balance)} ₽`;
});
const el = document.getElementById('siteBalanceDisplay');
if (el) {
el.innerHTML = Math.floor(data.balance).toLocaleString('ru') + ' ₽ <span style="font-size:0.6rem;opacity:0.5;margin-left:0.25rem">▼ депозит</span>';
}
updatePriceDisplay();
}
} catch (e) {
@@ -1091,7 +1092,7 @@
const inventoryIds = [];
for (const trashItem of trashItems) {
const invItem = items.find(i => i.item_id === trashItem.id &&
Math.abs(i.float - trashItem.float) < 0.001);
Math.abs(i.float - trashItem.float) < 0.01);
if (invItem) {
inventoryIds.push(invItem.id);
}
@@ -1101,10 +1102,28 @@
const formData = new FormData();
formData.append('inventory_ids', JSON.stringify(inventoryIds));
await fetch('/web/api/inventory/sell/bulk', {
const res = await fetch('/web/api/inventory/sell/bulk', {
method: 'POST',
body: formData
});
if (!res.ok) {
await new Promise(r => setTimeout(r, 500));
const retry = await fetch('/web/api/inventory/items');
const items2 = await retry.json();
const retryIds = [];
for (const trashItem of trashItems) {
const invItem = items2.find(i => i.item_id === trashItem.id &&
Math.abs(i.float - trashItem.float) < 0.01);
if (invItem && !inventoryIds.includes(invItem.id)) {
retryIds.push(invItem.id);
}
}
if (retryIds.length > 0) {
const fd2 = new FormData();
fd2.append('inventory_ids', JSON.stringify(retryIds));
await fetch('/web/api/inventory/sell/bulk', { method: 'POST', body: fd2 });
}
}
}
} catch (e) {
console.error('Ошибка продажи шлака:', e);
@@ -1702,7 +1721,7 @@
</div>
<div class="result-footer-enhanced">
<span class="result-price-enhanced">${(item.price || 100).toLocaleString()} ₽</span>
<button class="btn-sell-result" onclick="sellResultItem(${item.id})">Продать</button>
<button class="btn-sell-result" onclick="sellResultItem(${item.id}, ${item.float})">Продать</button>
</div>
</div>
${item.count > 1 ? `<span class="result-count-badge">x${item.count}</span>` : ''}
@@ -1724,13 +1743,14 @@
});
}
async function sellResultItem(itemId) {
async function sellResultItem(itemId, itemFloat) {
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);
const inventoryItem = items.find(i => i.item_id === itemId &&
Math.abs(i.float - (itemFloat || 0)) < 0.001);
if (!inventoryItem) {
Notify.error('Предмет не найден в инвентаре');
@@ -1865,8 +1885,7 @@
if (data && data.achievements_unlocked && Array.isArray(data.achievements_unlocked) && data.achievements_unlocked.length > 0) {
data.achievements_unlocked.forEach(ach => {
const title = ach.title || ach.name || 'Достижение';
const reward = ach.reward || '';
showAchievementPopup(title, reward);
showAchievementPopup(title);
});
}
}
+147
View File
@@ -152,6 +152,85 @@
.btn-open:hover {
background: var(--primary-hover);
}
.promo-wrapper {
background: linear-gradient(135deg, #1a1a2e 0%, #2d1b3d 50%, #1a1a2e 100%);
border: 1px solid rgba(255,215,0,0.2);
border-radius: 12px;
margin-bottom: 1.5rem;
padding: 0.75rem 1rem;
box-shadow: 0 0 20px rgba(255,215,0,0.05);
}
.promo-container {
display: flex;
align-items: center;
justify-content: space-between;
gap: 1rem;
flex-wrap: wrap;
}
.promo-info { display: flex; align-items: center; gap: 0.75rem; }
.promo-info--card { text-align: center; }
.promo-info--label {
font-size: 1.6rem;
font-weight: 700;
color: #ffd700;
line-height: 1;
}
.promo-info--label-bottom {
font-size: 0.65rem;
text-transform: uppercase;
color: var(--text-dim);
letter-spacing: 0.05em;
}
.promo-timer--inner { display: flex; align-items: center; gap: 0.5rem; }
.promo-timer--label {
font-size: 0.7rem;
color: var(--text-dim);
text-transform: uppercase;
letter-spacing: 0.05em;
}
.promo-timer--countdown {
font-size: 1.1rem;
font-weight: 700;
color: #ffd700;
font-variant-numeric: tabular-nums;
}
.promo-code { display: flex; align-items: center; gap: 0.5rem; }
.promo-code--label {
font-size: 0.65rem;
color: var(--text-dim);
text-transform: uppercase;
letter-spacing: 0.05em;
}
.promo-code--label-light { color: #ffd700; font-weight: 600; }
.promo-code--button {
background: linear-gradient(135deg, #ffd700, #f59e0b);
border: none;
border-radius: 8px;
padding: 0.4rem 1rem;
font-weight: 700;
font-size: 0.9rem;
cursor: pointer;
color: #1a1a2e;
transition: transform 0.15s, box-shadow 0.15s;
position: relative;
}
.promo-code--button:hover {
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(255,215,0,0.4);
}
.promo-code--button:active { transform: translateY(0); }
.promo-code--button .inner { position: relative; z-index: 2; }
.promo-code--button.copied {
background: linear-gradient(135deg, #16a34a, #15803d);
color: white;
}
@media (max-width: 640px) {
.promo-container { flex-direction: column; align-items: stretch; text-align: center; }
.promo-info { justify-content: center; }
.promo-timer--inner { justify-content: center; }
.promo-code { justify-content: center; flex-wrap: wrap; }
}
</style>
</head>
<body>
@@ -162,6 +241,33 @@
<h1>📦 Кейсы</h1>
<p class="page-subtitle">Выберите кейс для открытия</p>
{% if auto_promo and user %}
<section class="promo-wrapper" id="promocode-holder">
<div class="promo-container">
<div class="promo-info">
<div class="promo-info--card">
<div class="promo-info--label ff-secondary">+{{ auto_promo.reward_amount }}%</div>
<div class="promo-info--label-bottom">НА СЧЕТ</div>
</div>
</div>
<div class="promo-timer">
<div class="promo-timer--inner">
<p class="promo-timer--label">ОСТАЛОСЬ ВРЕМЕНИ:</p>
<span class="ff-secondary promo-timer--countdown" id="promocode-countdown" data-seconds="{{ auto_promo.expires_in_seconds }}">
<span>00</span>:<span>00</span>:<span>00</span>
</span>
</div>
</div>
<div class="promo-code" id="coupon-holder" data-promocode="{{ auto_promo.code }}">
<p class="promo-code--label">ИСПОЛЬЗУЙ <span class="promo-code--label-light">ПРОМОКОД:</span></p>
<button class="promo-code--button point-btn" onclick="copyAndOpenPromo('{{ auto_promo.code }}', this)">
<span class="inner">{{ auto_promo.code }}</span>
</button>
</div>
</div>
</section>
{% endif %}
<div class="cases-sections">
{% for section in sections %}
<div class="section-block">
@@ -207,6 +313,47 @@
</div>
</main>
<script>
// Промо-баннер таймер
(function() {
var el = document.getElementById('promocode-countdown');
if (!el) return;
var total = parseInt(el.dataset.seconds, 10) || 0;
var spans = el.querySelectorAll('span');
function tick() {
if (total <= 0) { spans[0].textContent = '00'; spans[1].textContent = '00'; spans[2].textContent = '00'; return; }
total--;
var h = Math.floor(total / 3600);
var m = Math.floor((total % 3600) / 60);
var s = total % 60;
spans[0].textContent = String(h).padStart(2, '0');
spans[1].textContent = String(m).padStart(2, '0');
spans[2].textContent = String(s).padStart(2, '0');
}
tick();
setInterval(tick, 1000);
})();
function copyAndOpenPromo(code, btn) {
if (!btn) btn = document.querySelector('.promo-code--button');
navigator.clipboard.writeText(code).then(function() {
btn.classList.add('copied');
btn.innerHTML = '<span class="inner">✓ СКОПИРОВАНО</span>';
setTimeout(function() {
btn.classList.remove('copied');
btn.innerHTML = '<span class="inner">' + code + '</span>';
}, 2000);
}).catch(function() {});
// Открываем депозит-попап и вставляем код
var overlay = document.getElementById('depositOverlay');
if (overlay) {
overlay.classList.add('open');
var input = document.getElementById('promoInput');
if (input) { input.value = code; input.focus(); }
// Грузим балансы
if (typeof loadDepositData === 'function') loadDepositData();
}
}
</script>
<script>
async function logout() {
await fetch('/web/api/auth/logout', { method: 'POST' });
+1 -1
View File
@@ -685,7 +685,7 @@
function handleAchievements(d) {
if(d && d.achievements_unlocked && Array.isArray(d.achievements_unlocked) && d.achievements_unlocked.length)
d.achievements_unlocked.forEach(a => showAchievementPopup(a.title || a.name || 'Достижение', a.reward || ''));
d.achievements_unlocked.forEach(a => showAchievementPopup(a.title || a.name || 'Достижение'));
}
function toggleSound() {
const e = SoundManager.toggle();
+8 -6
View File
@@ -445,9 +445,10 @@
myActiveBet = data.bet;
myCashoutMult = null;
SoundManager.crashBet();
document.querySelectorAll('.user-balance').forEach(el => {
el.textContent = `${Math.floor(data.new_balance)} ₽`;
});
const el = document.getElementById('siteBalanceDisplay');
if (el) {
el.innerHTML = Math.floor(data.new_balance).toLocaleString('ru') + ' ₽ <span style="font-size:0.6rem;opacity:0.5;margin-left:0.25rem">▼ депозит</span>';
}
updateUI();
} else {
SoundManager.error();
@@ -468,9 +469,10 @@
if (data.success) {
myCashoutMult = data.multiplier;
SoundManager.crashCashout();
document.querySelectorAll('.user-balance').forEach(el => {
el.textContent = `${Math.floor(data.new_balance)} ₽`;
});
const el = document.getElementById('siteBalanceDisplay');
if (el) {
el.innerHTML = Math.floor(data.new_balance).toLocaleString('ru') + ' ₽ <span style="font-size:0.6rem;opacity:0.5;margin-left:0.25rem">▼ депозит</span>';
}
updateUI();
} else {
SoundManager.error();
+162 -10
View File
@@ -140,6 +140,32 @@
transform: none;
}
.withdraw-selected-btn {
padding: 0.45rem 1.25rem;
background: var(--success-color);
color: #000;
border: none;
border-radius: 8px;
cursor: pointer;
font-weight: 500;
font-size: 0.78rem;
transition: all 0.2s;
font-family: 'Russo One', sans-serif;
text-transform: uppercase;
letter-spacing: 0.04em;
}
.withdraw-selected-btn:hover {
filter: brightness(1.1);
transform: translateY(-1px);
}
.withdraw-selected-btn:disabled {
opacity: 0.4;
cursor: not-allowed;
transform: none;
}
.sell-all-btn {
padding: 0.45rem 1.25rem;
background: transparent;
@@ -234,6 +260,25 @@
color: white;
}
.btn-withdraw-single {
flex: 1;
padding: 0.3rem;
background: transparent;
border: 1px solid var(--success-color);
color: var(--success-color);
border-radius: 6px;
cursor: pointer;
font-size: 0.7rem;
transition: all 0.2s;
font-family: 'Rajdhani', sans-serif;
font-weight: 600;
}
.btn-withdraw-single:hover {
background: var(--success-color);
color: #000;
}
.filter-bar {
display: flex;
gap: 0.5rem;
@@ -628,6 +673,7 @@
</div>
<div style="display:flex;gap:0.75rem;">
<button class="sell-selected-btn" id="sellSelectedBtn" onclick="sellSelected()" disabled>💰 Продать</button>
<button class="withdraw-selected-btn" id="withdrawSelectedBtn" onclick="withdrawSelected()" disabled>💳 Вывести</button>
<button class="sell-all-btn" onclick="openBulkSellModal()">📦 Массовая</button>
</div>
</div>
@@ -658,12 +704,12 @@
data-rarity="{{ item.rarity }}"
data-type="{{ item.type }}"
data-name="{{ item.name|lower }}"
data-price="{{ item.price_rub or 100 }}">
data-price="{{ item.price_rub }}">
{% if not is_public %}
<input type="checkbox" class="item-select-checkbox"
onchange="onItemSelect(this)"
data-id="{{ item.id }}"
data-price="{{ item.price_rub or 100 }}">
data-price="{{ item.price_rub }}">
{% endif %}
<div class="skin-image-container">
<img src="{{ item.image_url or '/static/placeholder.png' }}"
@@ -681,11 +727,12 @@
<span>{{ item.wear }}</span>
</div>
<div class="skin-details" style="margin-top:3px;color:var(--success-color);">
<span>💰 {{ (item.price_rub or 100)|money }} ₽</span>
<span>💰 {{ (item.price_rub)|money }} ₽</span>
</div>
{% if not is_public %}
<div class="item-actions">
<button onclick="sellSingleItem({{ item.id }})" class="btn-sell-single">Продать</button>
<button onclick="withdrawSingleItem({{ item.id }}, {{ (item.price_rub)|int }})" class="btn-withdraw-single">Вывести</button>
</div>
{% endif %}
</div>
@@ -719,7 +766,8 @@
</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>
<button class="btn btn-primary" onclick="executeBulkSell()" style="background:var(--danger-color);">💰 Продать</button>
<button class="btn btn-primary" onclick="executeBulkWithdraw()" style="background:var(--success-color);color:#000;">💳 Вывести</button>
</div>
</div>
</div>
@@ -826,6 +874,7 @@
const countBadge = document.getElementById('selectedCountBadge');
const priceBadge = document.getElementById('totalPriceBadge');
const sellBtn = document.getElementById('sellSelectedBtn');
const withdrawBtn = document.getElementById('withdrawSelectedBtn');
if (count > 0) {
countBadge.style.display = 'inline-block';
countBadge.textContent = count + ' выбрано';
@@ -834,10 +883,12 @@
priceBadge.style.display = 'inline-block';
priceBadge.textContent = total.toFixed(0) + ' ₽';
sellBtn.disabled = false;
withdrawBtn.disabled = false;
} else {
countBadge.style.display = 'none';
priceBadge.style.display = 'none';
sellBtn.disabled = true;
withdrawBtn.disabled = true;
}
}
@@ -846,9 +897,10 @@
const r = await fetch('/web/api/user/balance');
const d = await r.json();
if (d.success) {
document.querySelectorAll('.user-balance').forEach(el => {
el.textContent = Math.floor(d.balance) + ' ₽';
});
const el = document.getElementById('siteBalanceDisplay');
if (el) {
el.innerHTML = Math.floor(d.balance).toLocaleString('ru') + ' ₽ <span style="font-size:0.6rem;opacity:0.5;margin-left:0.25rem">▼ депозит</span>';
}
}
} catch(e) {}
}
@@ -906,6 +958,64 @@
});
}
function withdrawSingleItem(inventoryId, price) {
Notify.confirm('Вывести ' + (price||'').toLocaleString() + ' ₽ на карту? (Комиссия 10%)', 'Вывод', function(confirmed) {
if (!confirmed) return;
SoundManager.click();
const formData = new FormData();
formData.append('inventory_item_id', inventoryId);
fetch('/web/api/withdraw', { method: 'POST', body: formData })
.then(r => r.json())
.then(data => {
if (data.success) {
SoundManager.balanceUpdate();
Notify.success('Выведено ' + data.net.toFixed(0) + ' ₽ на карту');
const card = document.querySelector('.inventory-skin-card[data-inventory-id="' + inventoryId + '"]');
if (card) { card.style.opacity = '0'; card.style.transform = 'scale(0.8)'; setTimeout(() => card.remove(), 300); }
refreshBalance();
} else {
SoundManager.error();
Notify.error(data.error || 'Ошибка при выводе');
}
})
.catch(() => { SoundManager.error(); Notify.error('Ошибка соединения'); });
});
}
function withdrawSelected() {
if (selectedItems.size === 0) return;
let total = 0;
selectedItems.forEach(id => { total += itemPrices.get(id) || 100; });
const fee = total * 0.1;
Notify.confirm('Вывести ' + selectedItems.size + ' предметов на карту?\nСумма: ' + total.toFixed(0) + ' ₽\nКомиссия: ' + fee.toFixed(0) + ' ₽\nК зачислению: ' + (total - fee).toFixed(0) + ' ₽', 'Массовый вывод', function(confirmed) {
if (!confirmed) return;
SoundManager.click();
const ids = Array.from(selectedItems);
let completed = 0, errors = 0;
ids.forEach(function(invId) {
const formData = new FormData();
formData.append('inventory_item_id', invId);
fetch('/web/api/withdraw', { method: 'POST', body: formData })
.then(r => r.json())
.then(data => {
if (data.success) {
completed++;
const card = document.querySelector('.inventory-skin-card[data-inventory-id="' + invId + '"]');
if (card) { card.style.opacity = '0'; card.style.transform = 'scale(0.8)'; setTimeout(() => card.remove(), 300); }
} else {
errors++;
}
if (completed + errors === ids.length) {
Notify.success('Выведено ' + completed + ' предметов' + (errors ? ', ошибок: ' + errors : ''));
selectedItems.clear();
refreshBalance();
}
})
.catch(function() { errors++; });
});
});
}
function openBulkSellModal() {
const modal = document.getElementById('bulkSellModal');
const optionsDiv = document.getElementById('bulkSellOptions');
@@ -997,6 +1107,45 @@
});
}
function executeBulkWithdraw() {
const selected = [];
document.querySelectorAll('#bulkSellOptions input[type="checkbox"]:checked').forEach(cb => { if (cb.value && cb.value !== 'all') selected.push(cb.value); });
const allChecked = document.querySelector('#bulkSellOptions input[value="all"]')?.checked;
const ids = [];
document.querySelectorAll('.inventory-skin-card').forEach(card => {
if (card.style.display !== 'none') {
if (allChecked || selected.includes(card.dataset.rarity)) {
ids.push(parseInt(card.dataset.inventoryId));
}
}
});
if (ids.length === 0) { Notify.error('Выберите хотя бы одну редкость'); return; }
let totalPrice = 0;
ids.forEach(id => { totalPrice += itemPrices.get(id) || 100; });
const fee = totalPrice * 0.1;
Notify.confirm('Вывести ' + ids.length + ' предметов на карту?\nСумма: ' + totalPrice.toFixed(0) + ' ₽\nКомиссия: ' + fee.toFixed(0) + ' ₽\nК зачислению: ' + (totalPrice - fee).toFixed(0) + ' ₽', 'Массовый вывод', function(confirmed) {
if (!confirmed) return;
let completed = 0, errors = 0;
ids.forEach(function(invId) {
const formData = new FormData();
formData.append('inventory_item_id', invId);
fetch('/web/api/withdraw', { method: 'POST', body: formData })
.then(r => r.json())
.then(data => {
if (data.success) { completed++; }
else { errors++; }
if (completed + errors === ids.length) {
Notify.success('Выведено ' + completed + ' предметов' + (errors ? ', ошибок: ' + errors : ''));
refreshBalance();
closeBulkSellModal();
window.location.reload();
}
})
.catch(function() { errors++; });
});
});
}
function filterItems() {
const rf = document.getElementById('rarityFilter').value.toLowerCase();
const tf = document.getElementById('typeFilter').value.toLowerCase();
@@ -1071,7 +1220,7 @@
+ '<div class="skin-details"><span class="rarity-' + rc + '">' + (item.rarity||'') + '</span><span>' + fs + '</span></div>'
+ '<div class="skin-details" style="margin-top:3px;"><span>' + (item.type||'') + '</span><span>' + (item.wear||'') + '</span></div>'
+ '<div class="skin-details" style="margin-top:3px;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>';
+ '<div class="item-actions"><button onclick="sellSingleItem(' + item.id + ')" class="btn-sell-single">Продать</button><button onclick="withdrawSingleItem(' + item.id + ', ' + (item.price_rub||100) + ')" class="btn-withdraw-single">Вывести</button></div></div></div>';
});
grid.innerHTML = html;
selectedItems.clear();
@@ -1096,7 +1245,7 @@
grid.addEventListener('click', function(e) {
const card = e.target.closest('.inventory-skin-card');
if (!card) return;
if (e.target.closest('.item-select-checkbox, .btn-sell-single')) return;
if (e.target.closest('.item-select-checkbox, .btn-sell-single, .btn-withdraw-single')) return;
const invId = card.dataset.inventoryId;
if (!invId) return;
openItemCard(invId);
@@ -1155,7 +1304,10 @@
+ '<div class="ic-detail"><span class="ic-label">Тип</span><span class="ic-value">' + (item.type || 'Normal') + '</span></div>'
+ '<div class="ic-detail"><span class="ic-label">Цена</span><span class="ic-value" style="color:var(--success-color)">💰 ' + (item.price_rub || 0).toLocaleString() + ' ₽</span></div>'
+ (collHtml ? '<div class="ic-collection-title">🎨 Скины коллекции</div><div class="ic-collection-list">' + collHtml + '</div>' : '')
+ '<button class="btn-sell-single ic-sell-btn" onclick="sellSingleItem(' + item.id + '); closeItemCard();">Продать за ' + (item.price_rub || 0).toLocaleString() + ' ₽</button>'
+ '<div style="display:flex;gap:0.5rem;margin-top:0.75rem;">'
+ '<button class="ic-sell-btn" style="flex:1;" onclick="sellSingleItem(' + item.id + '); closeItemCard();">Продать за ' + (item.price_rub || 0).toLocaleString() + ' ₽</button>'
+ '<button class="ic-sell-btn" style="flex:1;background:var(--success-color);color:#000;" onclick="withdrawSingleItem(' + item.id + ', ' + (item.price_rub || 100) + '); closeItemCard();">Вывести</button>'
+ '</div>'
+ '</div></div>';
}
+14 -8
View File
@@ -517,9 +517,10 @@
const r = await fetch('/web/api/user/balance');
const d = await r.json();
if (d.success) {
document.querySelectorAll('.user-balance').forEach(el => {
el.textContent = `${Math.floor(d.balance).toLocaleString()} ₽`;
});
const el = document.getElementById('siteBalanceDisplay');
if (el) {
el.innerHTML = Math.floor(d.balance).toLocaleString('ru') + ' ₽ <span style="font-size:0.6rem;opacity:0.5;margin-left:0.25rem">▼ депозит</span>';
}
}
} catch (e) {}
}
@@ -609,6 +610,8 @@
let tickLastDeg = 0, tickCumulative = 0, tickNextThreshold = 15;
let tickLastTickCumulative = 0;
let tickControlPlayed = false;
let lastTickSoundTime = 0;
const TICK_SOUND_COOLDOWN = 60;
const tickSlowStart = data.final_angle - 90;
const tickStartTime = performance.now();
const tickMaxDuration = spinDuration * 1000 + 500;
@@ -634,16 +637,18 @@
if (delta < -180) delta += 360;
tickCumulative += delta;
tickLastDeg = deg;
if (tickCumulative >= tickNextThreshold) {
const now = performance.now();
if (tickCumulative >= tickNextThreshold && now - lastTickSoundTime >= TICK_SOUND_COOLDOWN) {
SoundManager.wheelSpin();
lastTickSoundTime = now;
tickLastTickCumulative = tickCumulative;
tickNextThreshold += tickCumulative < tickSlowStart ? 15 : 30;
}
// Контрольный тик: если до финала <10°, а последний тик был >15° назад
const remaining = data.final_angle - tickCumulative;
const gap = tickCumulative - tickLastTickCumulative;
if (remaining < 10 && remaining > 0 && gap > 15 && !tickControlPlayed) {
if (remaining < 10 && remaining > 0 && gap > 15 && !tickControlPlayed && now - lastTickSoundTime >= TICK_SOUND_COOLDOWN) {
SoundManager.wheelSpin();
lastTickSoundTime = now;
tickControlPlayed = true;
}
tickRAF = requestAnimationFrame(tickLoop);
@@ -661,6 +666,7 @@
const showResult = () => {
if (resultShown) return;
resultShown = true;
SoundManager.stopAll();
if (data.upgrade_success && data.received_item) {
document.getElementById('displayTargetImage').src = data.received_item.image_url || '/static/placeholder.png';
document.getElementById('displayTargetName').textContent = data.received_item.name.substring(0, 25);
@@ -735,7 +741,7 @@
item_id: item.item_id,
name: item.name,
rarity: item.rarity,
price_rub: item.price || item.price_rub || 100,
price_rub: item.price || item.price_rub || 0,
image_url: img,
wear: item.wear || '',
float: item.float || item.float_value || 0
@@ -764,7 +770,7 @@
data.achievements_unlocked.forEach(ach => {
const title = ach.title || ach.name || 'Достижение';
const reward = ach.reward || '';
showAchievementPopup(title, reward);
showAchievementPopup(title);
});
}
}