austnv/remnawave-minishop
1
0
Fork 0
Code Issues 1 Pull Requests Activity

fix: get email from panel if exist, tune webapp visual

Browse Source
This commit is contained in:
3252a8
2026-04-24 11:14:50 +03:00
parent 807a8933b9
commit c08ac854b2
3 changed files with 220 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/app/web/templates/subscription_webapp.css
+111 -65
View File
@@ -12,6 +12,7 @@
--text-muted: #64748b;
--accent: #00fe7a;
--accent-hover: #5aff9f;
--accent-glow: #00fe7a30;
--success: #10b981;
--warning: #f59e0b;
--danger: #ef4444;
@@ -34,16 +35,15 @@
html,
body {
width: 100%;
min-height: 100%;
margin: 0;
letter-spacing: 0;
overflow-x: hidden;
}
body {
background: var(--bg-primary);
background:
linear-gradient(180deg, color-mix(in srgb, var(--accent) 7%, transparent), transparent 320px),
var(--bg-primary);
color: var(--text-primary);
font-family: var(--font-sans);
line-height: 1.5;
@@ -72,12 +72,13 @@
}
.app {
width: min(100%, 560px);
width: min(100vw, 560px);
max-width: 100vw;
margin: 0 auto;
padding: calc(max(var(--app-safe-top), 14px) + var(--app-safe-top-extra)) 14px max(var(--app-safe-bottom), 18px);
padding: calc(max(var(--app-safe-top), 14px) + var(--app-safe-top-extra)) 14px max(var(--app-safe-bottom), 22px);
display: flex;
flex-direction: column;
gap: 14px;
gap: 16px;
}
.topbar {
@@ -86,6 +87,7 @@
justify-content: space-between;
gap: 12px;
min-height: 48px;
min-width: 0;
}
.brand {
@@ -105,6 +107,7 @@
.brand-logo {
display: block;
object-fit: contain;
border-radius: var(--radius-md);
}
.icon-btn {
@@ -126,10 +129,11 @@
font-size: 17px;
font-weight: 800;
line-height: 1.15;
letter-spacing: 0.04em;
letter-spacing: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-shadow: 0 0 20px color-mix(in srgb, var(--accent) 18%, transparent);
}
.top-actions {
@@ -137,6 +141,7 @@
align-items: center;
gap: 8px;
flex: 0 0 auto;
min-width: 0;
}
.icon-btn {
@@ -164,22 +169,26 @@
}
.panel {
background: linear-gradient(180deg, rgba(255, 255, 255, 0.03), rgba(255, 255, 255, 0.01)), var(--bg-card);
position: relative;
background: var(--bg-card);
border: 1px solid var(--border);
border-radius: var(--radius-lg);
box-shadow: 0 22px 48px rgba(0, 0, 0, 0.38);
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.18);
overflow: hidden;
}
.subscription-panel {
padding: 16px;
padding: 18px;
display: grid;
gap: 16px;
gap: 17px;
min-width: 0;
}
.account-panel {
padding: 16px;
padding: 17px;
display: grid;
gap: 14px;
min-width: 0;
}
.panel-head {
@@ -193,6 +202,7 @@
font-size: 18px;
font-weight: 850;
line-height: 1.2;
color: var(--text-primary);
}
.account-grid {
@@ -200,6 +210,8 @@
border: 1px solid var(--border);
border-radius: var(--radius-md);
overflow: hidden;
background: rgba(255, 255, 255, 0.018);
min-width: 0;
}
.account-row {
@@ -210,6 +222,7 @@
align-items: center;
gap: 10px;
background: rgba(255, 255, 255, 0.02);
min-width: 0;
}
.account-row + .account-row {
@@ -227,6 +240,7 @@
grid-template-columns: minmax(0, 1fr) minmax(120px, auto);
gap: 8px;
align-items: stretch;
min-width: 0;
}
.input {
@@ -234,7 +248,7 @@
min-height: 46px;
border-radius: var(--radius-md);
border: 1px solid var(--border);
background: rgba(255, 255, 255, 0.035);
background: rgba(5, 8, 13, 0.42);
color: var(--text-primary);
padding: 11px 12px;
font: inherit;
@@ -245,7 +259,8 @@
.input:focus {
border-color: color-mix(in srgb, var(--accent) 55%, var(--border));
box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 12%, transparent);
background: rgba(7, 12, 19, 0.68);
box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 12%, transparent), 0 12px 28px rgba(0, 0, 0, 0.2);
}
.input[aria-invalid="true"] {
@@ -271,6 +286,7 @@
align-items: center;
justify-content: space-between;
gap: 10px;
min-width: 0;
}
.mono-pill,
@@ -284,6 +300,7 @@
font-size: 11px;
font-weight: 700;
white-space: nowrap;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.06);
}
.mono-pill {
@@ -293,13 +310,18 @@
}
.badge {
background: rgba(16, 185, 129, 0.1);
color: var(--success);
border: 1px solid color-mix(in srgb, var(--success) 34%, var(--border));
background: rgba(16, 185, 129, 0.12);
color: #6ee7b7;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
}
.badge.off {
background: rgba(239, 68, 68, 0.1);
color: var(--danger);
border-color: color-mix(in srgb, var(--danger) 34%, var(--border));
background: rgba(239, 68, 68, 0.12);
color: #fca5a5;
}
.status-title {
@@ -310,23 +332,8 @@
overflow-wrap: anywhere;
}
.gradient-text {
.accent-text {
color: var(--text-primary);
background: linear-gradient(135deg, var(--text-primary), color-mix(in srgb, var(--accent) 68%, #ffffff));
-webkit-background-clip: text;
background-clip: text;
}
@supports ((-webkit-background-clip: text) or (background-clip: text)) {
.gradient-text {
color: transparent;
}
}
@supports (-webkit-text-fill-color: transparent) {
.gradient-text {
-webkit-text-fill-color: transparent;
}
}
@supports not (color: color-mix(in srgb, #000 50%, #fff)) {
@@ -353,22 +360,10 @@
background: var(--accent);
}
.gradient-text {
background: none;
color: var(--text-primary);
-webkit-text-fill-color: currentColor;
}
}
@supports not ((-webkit-background-clip: text) or (background-clip: text)) {
.gradient-text {
color: var(--text-primary);
-webkit-text-fill-color: currentColor;
}
}
.status-subtitle {
margin: 4px 0 0;
margin: 6px 0 0;
color: var(--text-secondary);
font-size: 14px;
}
@@ -379,6 +374,8 @@
border: 1px solid var(--border);
border-radius: var(--radius-md);
overflow: hidden;
background: rgba(255, 255, 255, 0.018);
min-width: 0;
}
.metric {
@@ -389,6 +386,7 @@
align-items: center;
padding: 10px 12px;
background: rgba(255, 255, 255, 0.02);
min-width: 0;
}
.metric + .metric {
@@ -400,6 +398,8 @@
font-family: var(--font-mono);
font-size: 11px;
font-weight: 700;
min-width: 0;
overflow-wrap: anywhere;
}
.metric-value {
@@ -408,12 +408,14 @@
font-weight: 750;
text-align: right;
overflow-wrap: anywhere;
min-width: 0;
}
.actions {
display: grid;
grid-template-columns: minmax(0, 1fr) 48px;
gap: 8px;
min-width: 0;
}
.step-actions {
@@ -436,15 +438,16 @@
font-weight: 800;
text-align: center;
text-decoration: none;
min-width: 0;
overflow-wrap: anywhere;
transition: transform var(--transition), border-color var(--transition), background var(--transition), color var(--transition), box-shadow var(--transition);
}
.btn.primary {
border-color: color-mix(in srgb, var(--accent) 80%, var(--border));
background:
linear-gradient(135deg, var(--accent), color-mix(in srgb, var(--accent) 76%, #00c95f));
background: var(--accent);
color: #04110a;
box-shadow: 0 10px 26px color-mix(in srgb, var(--accent) 20%, transparent);
box-shadow: 0 10px 26px color-mix(in srgb, var(--accent) 18%, transparent);
}
.btn.ghost {
@@ -495,7 +498,7 @@
}
#legal-links-login {
width: min(100%, 560px);
width: min(100vw, 560px);
}
.legal-link {
@@ -541,7 +544,7 @@
inset: 0;
padding: 0;
border: 0;
background: rgba(0, 0, 0, 0.62);
background: rgba(3, 6, 10, 0.72);
backdrop-filter: blur(7px);
}
@@ -559,9 +562,10 @@
}
.payment-flow {
padding: 14px;
padding: 16px;
display: grid;
gap: 14px;
box-shadow: 0 30px 60px rgba(0, 0, 0, 0.28);
}
.code-modal-stack {
@@ -575,7 +579,7 @@
.code-modal-card {
width: 100%;
padding: 16px;
padding: 18px;
display: grid;
gap: 14px;
}
@@ -644,7 +648,7 @@
place-items: center;
border: 1px solid var(--border);
border-radius: var(--radius-md);
background: rgba(255, 255, 255, 0.035);
background: rgba(5, 8, 13, 0.42);
color: var(--text-primary);
font-family: var(--font-mono);
font-size: 20px;
@@ -697,6 +701,7 @@
border-radius: var(--radius-md);
background: rgba(255, 255, 255, 0.02);
color: var(--text-muted);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.045);
}
.step-num {
@@ -761,13 +766,19 @@
gap: 12px;
text-align: left;
transition: transform var(--transition), border-color var(--transition), background var(--transition), box-shadow var(--transition);
min-width: 0;
}
.plan > span,
.method > span {
min-width: 0;
}
.plan.active,
.method.active {
border-color: var(--accent);
background: color-mix(in srgb, var(--accent) 8%, transparent);
box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 58%, transparent);
box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 58%, transparent), 0 12px 30px rgba(0, 0, 0, 0.2);
}
.plan-name,
@@ -796,6 +807,9 @@
color: var(--accent);
font-family: var(--font-mono);
text-align: right;
text-shadow: 0 0 18px color-mix(in srgb, var(--accent) 18%, transparent);
max-width: 48%;
overflow-wrap: anywhere;
}
.notice,
@@ -838,11 +852,12 @@
}
.login-card {
width: min(100%, 560px);
padding: 18px;
width: min(100vw, 560px);
padding: 20px;
display: grid;
gap: 13px;
gap: 15px;
text-align: center;
box-shadow: 0 30px 60px rgba(0, 0, 0, 0.28);
}
.auth-tabs {
@@ -853,7 +868,7 @@
gap: 4px;
border: 1px solid var(--border);
border-radius: var(--radius-md);
background: rgba(255, 255, 255, 0.02);
background: rgba(5, 8, 13, 0.38);
}
.auth-tab {
@@ -868,6 +883,7 @@
.auth-tab.active {
background: color-mix(in srgb, var(--accent) 12%, transparent);
color: var(--accent);
box-shadow: none;
}
.auth-pane {
@@ -890,7 +906,7 @@
font-size: 24px;
font-weight: 800;
line-height: 1.1;
letter-spacing: 0.04em;
letter-spacing: 0;
text-align: left;
overflow-wrap: anywhere;
}
@@ -955,12 +971,11 @@
.method:hover:not(:disabled) {
transform: translateY(-2px);
border-color: color-mix(in srgb, var(--accent) 42%, var(--border));
background: rgba(255, 255, 255, 0.055);
background: var(--bg-card-hover);
}
.btn.primary:hover:not(:disabled) {
background:
linear-gradient(135deg, var(--accent-hover), color-mix(in srgb, var(--accent) 78%, #00c95f));
background: var(--accent-hover);
box-shadow: 0 14px 34px color-mix(in srgb, var(--accent) 24%, transparent);
}
@@ -974,7 +989,7 @@
}
}
@media (max-width: 380px) {
@media (max-width: 460px) {
.app {
padding-left: 10px;
padding-right: 10px;
@@ -1001,6 +1016,31 @@
text-align: left;
}
.badge-row {
align-items: flex-start;
flex-direction: column;
}
.badge,
.mono-pill {
max-width: 100%;
}
.field-row .btn {
width: 100%;
}
.plan,
.method {
align-items: flex-start;
flex-direction: column;
}
.plan-price {
max-width: 100%;
text-align: left;
}
.step-actions {
grid-template-columns: 1fr;
}
@@ -1046,6 +1086,12 @@
}
@media (max-width: 380px) {
.brand-title {
max-width: 150px;
}
}
@media (max-width: 560px) {
.modal {
align-items: stretch;
bot/app/web/templates/subscription_webapp.html
+1 -1
View File
@@ -45,7 +45,7 @@
</div>
<div>
<h1 id="remaining" class="status-title gradient-text">...</h1>
<h1 id="remaining" class="status-title accent-text">...</h1>
<p class="status-subtitle" data-i18n="subscription_subtitle">Ваша ссылка подключения и срок доступа</p>
</div>
bot/handlers/admin/sync_admin.py
+108 -13
View File
@@ -18,6 +18,11 @@ from bot.middlewares.i18n import JsonI18n
router = Router(name="admin_sync_router")
def _normalize_panel_email(value: Optional[str]) -> Optional[str]:
email = (value or "").strip().lower()
return email or None
def _extract_lifetime_used_traffic_bytes(panel_user_data: dict) -> Optional[int]:
user_traffic = panel_user_data.get("userTraffic") or {}
raw_value = (
@@ -36,6 +41,85 @@ def _extract_lifetime_used_traffic_bytes(panel_user_data: dict) -> Optional[int]
return None
async def _bind_panel_email_to_user(
session: AsyncSession,
*,
existing_user,
email_from_panel: Optional[str],
panel_uuid: str,
) -> tuple[object, bool]:
"""Bind panel email to a local user without violating the unique email index.
Panel email is treated as verified because it comes from the operator-managed
panel. If the same email already belongs to an email-only local account for
this panel user, merge that account into the Telegram/local user.
"""
if not email_from_panel:
return existing_user, False
if existing_user.email == email_from_panel:
if not existing_user.email_verified_at:
existing_user.email_verified_at = datetime.now(timezone.utc)
return existing_user, True
return existing_user, False
user_with_email = await user_dal.get_user_by_email(session, email_from_panel)
if user_with_email and user_with_email.user_id != existing_user.user_id:
can_merge_email_identity = (
not user_with_email.telegram_id
and user_with_email.panel_user_uuid in (None, panel_uuid)
and (not existing_user.email or existing_user.email == email_from_panel)
)
if can_merge_email_identity:
try:
merged_user = await user_dal.merge_users(
session,
source_user_id=user_with_email.user_id,
target_user_id=existing_user.user_id,
)
if not merged_user.email:
merged_user.email = email_from_panel
if not merged_user.email_verified_at:
merged_user.email_verified_at = datetime.now(timezone.utc)
logging.info(
"Merged email-only user %s into user %s while binding panel email %s for panel UUID %s.",
user_with_email.user_id,
merged_user.user_id,
email_from_panel,
panel_uuid,
)
return merged_user, True
except Exception as merge_error:
logging.warning(
"Could not merge email-only user %s into user %s for panel email %s: %s",
user_with_email.user_id,
existing_user.user_id,
email_from_panel,
merge_error,
)
return existing_user, False
logging.warning(
"Panel email %s for panel UUID %s is already linked to local user %s; "
"skipping email binding for user %s.",
email_from_panel,
panel_uuid,
user_with_email.user_id,
existing_user.user_id,
)
return existing_user, False
existing_user.email = email_from_panel
existing_user.email_verified_at = datetime.now(timezone.utc)
logging.info(
"Bound panel email %s to local user %s for panel UUID %s.",
email_from_panel,
existing_user.user_id,
panel_uuid,
)
return existing_user, True
async def perform_sync(
panel_service: PanelApiService,
session: AsyncSession,
@@ -94,7 +178,7 @@ async def perform_sync(
"shortUuid"
)
telegram_id_from_panel = panel_user_dict.get("telegramId")
email_from_panel = (panel_user_dict.get("email") or "").strip().lower() or None
email_from_panel = _normalize_panel_email(panel_user_dict.get("email"))
if not panel_uuid:
sync_errors.append(f"Panel user missing UUID: {panel_user_dict}")
@@ -124,14 +208,8 @@ async def perform_sync(
f"Found user by telegramId {telegram_id_from_panel}"
)
if not existing_user and email_from_panel:
existing_user = await user_dal.get_user_by_email(
session, email_from_panel
)
if existing_user:
logging.debug(f"Found user by email {email_from_panel}")
# If not found by telegram ID, try to find by panel UUID
# If not found by telegram ID, try to find by panel UUID.
# The panel UUID is the strongest local link for subscription sync.
if not existing_user:
existing_user = await user_dal.get_user_by_panel_uuid(
session, panel_uuid
@@ -149,6 +227,15 @@ async def perform_sync(
f"TelegramId mismatch: panel={telegram_id_from_panel}, local={existing_user.user_id}"
)
# Finally, fall back to email. This mainly catches panel users that
# were first imported as email-only identities.
if not existing_user and email_from_panel:
existing_user = await user_dal.get_user_by_email(
session, email_from_panel
)
if existing_user:
logging.debug(f"Found user by email {email_from_panel}")
if not existing_user:
users_not_found_in_db += 1
if telegram_id_from_panel:
@@ -158,6 +245,11 @@ async def perform_sync(
"user_id": telegram_id_from_panel,
"telegram_id": telegram_id_from_panel,
"email": email_from_panel,
"email_verified_at": (
datetime.now(timezone.utc)
if email_from_panel
else None
),
"username": None, # Username will be updated when user interacts with bot
"first_name": None, # Panel doesn't provide this info
"last_name": None, # Panel doesn't provide this info
@@ -229,10 +321,13 @@ async def perform_sync(
logging.info(
f"Updated panel UUID for user {actual_user_id}: {panel_uuid}"
)
if email_from_panel and existing_user.email != email_from_panel:
existing_user.email = email_from_panel
if not existing_user.email_verified_at:
existing_user.email_verified_at = datetime.now(timezone.utc)
existing_user, email_was_bound = await _bind_panel_email_to_user(
session,
existing_user=existing_user,
email_from_panel=email_from_panel,
panel_uuid=panel_uuid,
)
if email_was_bound:
user_was_updated = True
if (
telegram_id_from_panel