Compare commits
No commits in common. "main" and "0.8.5" have entirely different histories.
170
build.ipynb
170
build.ipynb
@ -695,23 +695,6 @@
|
||||
"## RSYNC"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "ead8aa36",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"%%bash\n",
|
||||
"ssh kultmost 'mkdir -p /var/lib/app/.gnupg'\n",
|
||||
"ssh kultmost 'chmod 700 /var/lib/app/.gnupg'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"id": "0a429fca",
|
||||
@ -834,35 +817,6 @@
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "434ecf4b",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"%%bash\n",
|
||||
"ssh kultmost 'tee /app/production/start-uvicorn-back.sh >/dev/null' <<'EOF'\n",
|
||||
"#!/usr/bin/bash\n",
|
||||
"set -euo pipefail\n",
|
||||
"\n",
|
||||
"workers=\"$(nproc)\"\n",
|
||||
"\n",
|
||||
"exec /app/production/.venv/bin/uvicorn main:app \\\n",
|
||||
" --host 127.0.0.1 \\\n",
|
||||
" --port 30080 \\\n",
|
||||
" --workers \"$workers\"\n",
|
||||
"EOF\n",
|
||||
"\n",
|
||||
"ssh kultmost 'chmod +x /app/production/start-uvicorn-back.sh'\n",
|
||||
"ssh kultmost 'ls -ln /app/production/start-uvicorn-back.sh'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
@ -874,24 +828,23 @@
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"%%bash\n",
|
||||
"ssh kultmost 'tee /etc/systemd/system/fastapi.service >/dev/null' <<'EOF'\n",
|
||||
"[Unit]\n",
|
||||
"Description=FastAPI prod service\n",
|
||||
"After=network.target\n",
|
||||
"# %%bash\n",
|
||||
"# ssh kultmost 'tee /etc/systemd/system/fastapi.service >/dev/null' <<'EOF'\n",
|
||||
"# [Unit]\n",
|
||||
"# Description=FastAPI prod service\n",
|
||||
"# After=network.target\n",
|
||||
"\n",
|
||||
"[Service]\n",
|
||||
"WorkingDirectory=/app/production\n",
|
||||
"ExecStart=/app/production/start-uvicorn-back.sh\n",
|
||||
"Restart=always\n",
|
||||
"EnvironmentFile=/app/production/env\n",
|
||||
"CPUWeight=60\n",
|
||||
"# [Service]\n",
|
||||
"# WorkingDirectory=/app/production\n",
|
||||
"# ExecStart=/app/production/.venv/bin/uvicorn main:app --host 127.0.0.1 --port 30080 --workers 8\n",
|
||||
"# Restart=always\n",
|
||||
"# EnvironmentFile=/app/production/env\n",
|
||||
"\n",
|
||||
"[Install]\n",
|
||||
"WantedBy=multi-user.target\n",
|
||||
"EOF\n",
|
||||
"# [Install]\n",
|
||||
"# WantedBy=default.target\n",
|
||||
"# EOF\n",
|
||||
"\n",
|
||||
"ssh kultmost 'systemctl daemon-reload && systemctl enable --now fastapi.service && systemctl status --no-pager -l fastapi.service'\n"
|
||||
"# ssh kultmost 'systemctl daemon-reload && systemctl enable --now fastapi.service && systemctl status --no-pager -l fastapi.service'\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
@ -1007,75 +960,9 @@
|
||||
"id": "0474516d",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"### restart production "
|
||||
"### restart fastapi"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "5d35489f",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!ssh kultmost 'systemctl start fastapi.service'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "c477dcdd",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!ssh kultmost 'systemctl status fastapi.service'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "1eccaed4",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"%%bash\n",
|
||||
"ssh kultmost 'tee /etc/nginx/sites-enabled/avtopost_back >/dev/null' <<'EOF'\n",
|
||||
"upstream backend_avtopost_servers {\n",
|
||||
" server 127.0.0.1:30080;\n",
|
||||
"}\n",
|
||||
"EOF\n",
|
||||
"ssh kultmost 'nginx -t'\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "11a407c2",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!ssh kultmost 'nginx -s reload'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
@ -1109,7 +996,7 @@
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "1cef4109",
|
||||
"id": "6fdc2d37",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
@ -1117,28 +1004,7 @@
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"%%bash\n",
|
||||
"ssh kultmost 'tee /etc/nginx/sites-enabled/avtopost_back >/dev/null' <<'EOF'\n",
|
||||
"upstream backend_avtopost_servers {\n",
|
||||
" server 127.0.0.1:30081;\n",
|
||||
"}\n",
|
||||
"EOF\n",
|
||||
"ssh kultmost 'nginx -t'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "42b4958a",
|
||||
"metadata": {
|
||||
"vscode": {
|
||||
"languageId": "shellscript"
|
||||
}
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!ssh kultmost 'nginx -s reload'"
|
||||
"# !ssh kultmost 'systemctl restart fastapi.service'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
@ -1153,7 +1019,7 @@
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!ssh kultmost 'systemctl stop fastapi.service'"
|
||||
"# !ssh kultmost 'systemctl status fastapi.service'"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
|
||||
@ -125,7 +125,7 @@ async def accept_delivery(
|
||||
|
||||
new_doc = {
|
||||
**existing,
|
||||
"status": "Получено галерей" if 'partner' in current_user.get('roles', []) else "Получено художником",
|
||||
"status": "Получено",
|
||||
"notify": notify.upserted_id,
|
||||
"received_at": datetime.utcnow(),
|
||||
"updated_at": datetime.utcnow(),
|
||||
|
||||
274
email_task.ipynb
274
email_task.ipynb
@ -38,8 +38,7 @@
|
||||
" load_env('env')\n",
|
||||
"except:\n",
|
||||
" load_env('env_example')"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
@ -49,33 +48,17 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"import smtplib\n",
|
||||
"import os\n",
|
||||
"from email.mime.application import MIMEApplication\n",
|
||||
"from email.mime.multipart import MIMEMultipart\n",
|
||||
"from email.mime.text import MIMEText\n",
|
||||
"from email.utils import formatdate, make_msgid\n",
|
||||
"from typing import Optional\n",
|
||||
"import gnupg\n",
|
||||
"from celery import Celery\n",
|
||||
"from config import *\n",
|
||||
"from db import *\n",
|
||||
"from templates import templates\n",
|
||||
"import logging\n",
|
||||
"import asyncio \n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "ea1066a5",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"def build_unsubscribe_url(email: str, token: str, base_url: str) -> str:\n",
|
||||
" return f\"{base_url}/api/v1/email/unsubscribe?token={token}&email={email}\"\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
"from typing import Optional\n",
|
||||
"import asyncio \n",
|
||||
"from email.utils import formatdate, make_msgid\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
@ -84,211 +67,37 @@
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"GPG_HOME = os.getenv(\"GPG_HOME\", \"/var/lib/app/.gnupg\")\n",
|
||||
"GPG_BINARY = os.getenv(\"GPG_BINARY\", \"gpg\")\n",
|
||||
"\n",
|
||||
"gpg = gnupg.GPG(\n",
|
||||
" gnupghome=GPG_HOME,\n",
|
||||
" gpgbinary=GPG_BINARY,\n",
|
||||
")\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"def build_unsubscribe_url(\n",
|
||||
" to_email: str,\n",
|
||||
" user_id: Optional[int],\n",
|
||||
" domain: str,\n",
|
||||
") -> str:\n",
|
||||
" \"\"\"\n",
|
||||
" Replace this implementation with your real unsubscribe URL builder.\n",
|
||||
" Avoid putting a raw email address in the URL in production.\n",
|
||||
" \"\"\"\n",
|
||||
" from urllib.parse import quote\n",
|
||||
"\n",
|
||||
" return f\"https://{domain}/unsubscribe?email={quote(to_email)}\"\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"def import_public_key(public_key: str) -> str:\n",
|
||||
" \"\"\"\n",
|
||||
" Import an ASCII-armored public key and return its fingerprint.\n",
|
||||
"\n",
|
||||
" The database value should contain the complete public key, for example:\n",
|
||||
"\n",
|
||||
" -----BEGIN PGP PUBLIC KEY BLOCK-----\n",
|
||||
" ...\n",
|
||||
" -----END PGP PUBLIC KEY BLOCK-----\n",
|
||||
" \"\"\"\n",
|
||||
" result = gpg.import_keys(public_key)\n",
|
||||
"\n",
|
||||
" if not result.fingerprints:\n",
|
||||
" raise RuntimeError(\n",
|
||||
" f\"Unable to import the recipient's public key: {result}\"\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" # Use the imported fingerprint rather than the email address. The email\n",
|
||||
" # address in the key's UID may not exactly match the recipient address.\n",
|
||||
" return result.fingerprints[0]\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"def encrypt_mime_message(\n",
|
||||
" message,\n",
|
||||
" recipient_fingerprint: str,\n",
|
||||
"):\n",
|
||||
" \"\"\"\n",
|
||||
" Encrypt an already-built MIME message and return a PGP/MIME message.\n",
|
||||
" \"\"\"\n",
|
||||
"\n",
|
||||
" # Serialize the original MIME message before encryption.\n",
|
||||
" plaintext = message.as_bytes()\n",
|
||||
"\n",
|
||||
" # Binary OpenPGP data is appropriate for application/octet-stream.\n",
|
||||
" encrypted = gpg.encrypt(\n",
|
||||
" plaintext,\n",
|
||||
" recipients=[recipient_fingerprint],\n",
|
||||
" armor=False,\n",
|
||||
" always_trust=False,\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" if not encrypted.ok:\n",
|
||||
" raise RuntimeError(\n",
|
||||
" f\"GPG encryption failed: {encrypted.status}; \"\n",
|
||||
" f\"stderr: {encrypted.stderr}\"\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" encrypted_bytes = encrypted.data\n",
|
||||
"\n",
|
||||
" if not encrypted_bytes:\n",
|
||||
" raise RuntimeError(\"GPG returned an empty encrypted message\")\n",
|
||||
"\n",
|
||||
" encrypted_message = MIMEMultipart(\n",
|
||||
" \"encrypted\",\n",
|
||||
" protocol=\"application/pgp-encrypted\",\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" # Copy normal mail headers. Content-Type and MIME-Version are generated\n",
|
||||
" # automatically for the new multipart/encrypted message.\n",
|
||||
" for header in (\n",
|
||||
" \"From\",\n",
|
||||
" \"To\",\n",
|
||||
" \"Subject\",\n",
|
||||
" \"Message-ID\",\n",
|
||||
" \"Date\",\n",
|
||||
" \"X-Priority\",\n",
|
||||
" \"Importance\",\n",
|
||||
" \"X-Auto-Response-Suppress\",\n",
|
||||
" \"List-Unsubscribe\",\n",
|
||||
" \"List-Unsubscribe-Post\",\n",
|
||||
" ):\n",
|
||||
" value = message.get(header)\n",
|
||||
" if value is not None:\n",
|
||||
" encrypted_message[header] = value\n",
|
||||
"\n",
|
||||
" # Required PGP/MIME version part.\n",
|
||||
" version_part = MIMEApplication(\n",
|
||||
" b\"Version: 1\\r\\n\",\n",
|
||||
" _subtype=\"pgp-encrypted\",\n",
|
||||
" )\n",
|
||||
" version_part.add_header(\n",
|
||||
" \"Content-Description\",\n",
|
||||
" \"PGP/MIME version identification\",\n",
|
||||
" )\n",
|
||||
" encrypted_message.attach(version_part)\n",
|
||||
"\n",
|
||||
" # Encrypted MIME payload.\n",
|
||||
" encrypted_part = MIMEApplication(\n",
|
||||
" encrypted_bytes,\n",
|
||||
" _subtype=\"octet-stream\",\n",
|
||||
" )\n",
|
||||
" encrypted_part.add_header(\n",
|
||||
" \"Content-Description\",\n",
|
||||
" \"OpenPGP encrypted message\",\n",
|
||||
" )\n",
|
||||
" encrypted_part.add_header(\n",
|
||||
" \"Content-Disposition\",\n",
|
||||
" \"inline\",\n",
|
||||
" filename=\"encrypted.asc\",\n",
|
||||
" )\n",
|
||||
" encrypted_message.attach(encrypted_part)\n",
|
||||
"\n",
|
||||
" return encrypted_message\n",
|
||||
"def build_unsubscribe_url(email: str, token: str, base_url: str) -> str:\n",
|
||||
" return f\"{base_url}/api/v1/email/unsubscribe?token={token}&email={email}\"\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"async def create_email_message(\n",
|
||||
" to_email: str,\n",
|
||||
" subject: str,\n",
|
||||
" html_content: str,\n",
|
||||
" user_id: Optional[int] = None,\n",
|
||||
" user_id: int = None,\n",
|
||||
"):\n",
|
||||
" \"\"\"\n",
|
||||
" Create an HTML email.\n",
|
||||
"\n",
|
||||
" If the recipient has a public GPG key in the database, the complete\n",
|
||||
" MIME message is encrypted using PGP/MIME.\n",
|
||||
"\n",
|
||||
" Expected database structure:\n",
|
||||
"\n",
|
||||
" {\n",
|
||||
" \"email\": \"recipient@example.com\",\n",
|
||||
" \"gnupg\": \"-----BEGIN PGP PUBLIC KEY BLOCK-----\\\\n...\"\n",
|
||||
" }\n",
|
||||
" \"\"\"\n",
|
||||
"\n",
|
||||
" msg = MIMEMultipart(\"alternative\")\n",
|
||||
"\n",
|
||||
" msg[\"From\"] = f\"{FROM_NAME} <{FROM_EMAIL}>\"\n",
|
||||
" msg[\"To\"] = to_email\n",
|
||||
" msg[\"Subject\"] = subject\n",
|
||||
" msg[\"Message-ID\"] = make_msgid(\n",
|
||||
" domain=FROM_EMAIL.rsplit(\"@\", 1)[1],\n",
|
||||
" )\n",
|
||||
" msg[\"Date\"] = formatdate(localtime=True)\n",
|
||||
" msg[\"X-Priority\"] = \"3\"\n",
|
||||
" msg[\"Importance\"] = \"normal\"\n",
|
||||
" msg[\"X-Auto-Response-Suppress\"] = \"All\"\n",
|
||||
"\n",
|
||||
" # Do not send unsubscribe headers to yourself.\n",
|
||||
" if to_email.lower() != FROM_EMAIL.lower():\n",
|
||||
" unsubscribe_url = build_unsubscribe_url(\n",
|
||||
" to_email=to_email,\n",
|
||||
" user_id=user_id,\n",
|
||||
" domain=FULL_DOMAIN,\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" msg[\"List-Unsubscribe\"] = f\"<{unsubscribe_url}>\"\n",
|
||||
" msg[\"List-Unsubscribe-Post\"] = \"List-Unsubscribe=One-Click\"\n",
|
||||
"\n",
|
||||
" msg.attach(\n",
|
||||
" MIMEText(\n",
|
||||
" html_content,\n",
|
||||
" \"html\",\n",
|
||||
" \"utf-8\",\n",
|
||||
" )\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" # Fetch the recipient's public key.\n",
|
||||
" user = await users_collection.find_one(\n",
|
||||
" {\"email\": to_email},\n",
|
||||
" {\"gnupg\": 1},\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" public_key = user.get(\"gnupg\") if user else None\n",
|
||||
"\n",
|
||||
" if not public_key:\n",
|
||||
" # Return a normal unencrypted email when no key is available.\n",
|
||||
" return msg\n",
|
||||
"\n",
|
||||
" if not isinstance(public_key, str):\n",
|
||||
" raise TypeError(\"The gnupg database field must be a string\")\n",
|
||||
"\n",
|
||||
" try:\n",
|
||||
" fingerprint = import_public_key(public_key)\n",
|
||||
" return encrypt_mime_message(msg, fingerprint)\n",
|
||||
"\n",
|
||||
" except Exception:\n",
|
||||
" # Encryption is mandatory whenever a key exists.\n",
|
||||
" # Do not silently send the message unencrypted.\n",
|
||||
" raise\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
" \n",
|
||||
" msg['From'] = f\"{FROM_NAME} <{FROM_EMAIL}>\"\n",
|
||||
" msg['To'] = to_email\n",
|
||||
" msg['Subject'] = subject\n",
|
||||
" msg['Message-ID'] = make_msgid(domain=FROM_EMAIL.split('@')[1])\n",
|
||||
" msg['Date'] = formatdate(localtime=True)\n",
|
||||
" msg['X-Priority'] = \"3\"\n",
|
||||
" msg['Importance'] = \"normal\"\n",
|
||||
" msg['X-Auto-Response-Suppress'] = \"All\"\n",
|
||||
" \n",
|
||||
" # token = await create_unsubscribe_token(to_email, user_id)\n",
|
||||
" unsubscribe_url = build_unsubscribe_url(to_email, None, FULL_DOMAIN)\n",
|
||||
" if to_email != FROM_EMAIL:\n",
|
||||
" msg['List-Unsubscribe'] = f\"<{unsubscribe_url}>\"\n",
|
||||
" msg['List-Unsubscribe-Post'] = \"List-Unsubscribe=One-Click\"\n",
|
||||
" \n",
|
||||
" msg.attach(MIMEText(html_content, 'html'))\n",
|
||||
" \n",
|
||||
" return msg\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
@ -331,8 +140,7 @@
|
||||
" f\"Subject: {subject}, Error: {str(e)}\"\n",
|
||||
" )\n",
|
||||
" return False\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
@ -342,8 +150,7 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"celery_app_email = Celery('emails', broker=f'{redis_uri}2', backend=f'{redis_uri}2', task_track_started=True)\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
@ -382,8 +189,7 @@
|
||||
" f\"Ошибка при отправке email на {to_email} (попытка {self.request.retries + 1}): {exc}\"\n",
|
||||
" )\n",
|
||||
" raise self.retry(exc=exc)\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
@ -393,18 +199,6 @@
|
||||
"## Run"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "3aeae7e8",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!mkdir -p /var/lib/app/.gnupg\n",
|
||||
"!chmod 700 /var/lib/app/.gnupg"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
@ -434,8 +228,7 @@
|
||||
"\n",
|
||||
" with open(f'{filename_without_extension}.py', 'w') as f:\n",
|
||||
" f.write('\\n\\n'.join(app))\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
@ -445,8 +238,7 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"!celery -A email_task.celery_app_email worker --loglevel=info"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
]
|
||||
}
|
||||
],
|
||||
"metadata": {
|
||||
|
||||
224
email_task.py
224
email_task.py
@ -32,228 +32,48 @@ except:
|
||||
load_env('env_example')
|
||||
|
||||
import smtplib
|
||||
import os
|
||||
from email.mime.application import MIMEApplication
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
from email.utils import formatdate, make_msgid
|
||||
from typing import Optional
|
||||
import gnupg
|
||||
from celery import Celery
|
||||
from config import *
|
||||
from db import *
|
||||
from templates import templates
|
||||
import logging
|
||||
from typing import Optional
|
||||
import asyncio
|
||||
from email.utils import formatdate, make_msgid
|
||||
|
||||
|
||||
def build_unsubscribe_url(email: str, token: str, base_url: str) -> str:
|
||||
return f"{base_url}/api/v1/email/unsubscribe?token={token}&email={email}"
|
||||
|
||||
|
||||
GPG_HOME = os.getenv("GPG_HOME", "/var/lib/app/.gnupg")
|
||||
GPG_BINARY = os.getenv("GPG_BINARY", "gpg")
|
||||
|
||||
gpg = gnupg.GPG(
|
||||
gnupghome=GPG_HOME,
|
||||
gpgbinary=GPG_BINARY,
|
||||
)
|
||||
|
||||
|
||||
def build_unsubscribe_url(
|
||||
to_email: str,
|
||||
user_id: Optional[int],
|
||||
domain: str,
|
||||
) -> str:
|
||||
"""
|
||||
Replace this implementation with your real unsubscribe URL builder.
|
||||
Avoid putting a raw email address in the URL in production.
|
||||
"""
|
||||
from urllib.parse import quote
|
||||
|
||||
return f"https://{domain}/unsubscribe?email={quote(to_email)}"
|
||||
|
||||
|
||||
def import_public_key(public_key: str) -> str:
|
||||
"""
|
||||
Import an ASCII-armored public key and return its fingerprint.
|
||||
|
||||
The database value should contain the complete public key, for example:
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
...
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
"""
|
||||
result = gpg.import_keys(public_key)
|
||||
|
||||
if not result.fingerprints:
|
||||
raise RuntimeError(
|
||||
f"Unable to import the recipient's public key: {result}"
|
||||
)
|
||||
|
||||
# Use the imported fingerprint rather than the email address. The email
|
||||
# address in the key's UID may not exactly match the recipient address.
|
||||
return result.fingerprints[0]
|
||||
|
||||
|
||||
def encrypt_mime_message(
|
||||
message,
|
||||
recipient_fingerprint: str,
|
||||
):
|
||||
"""
|
||||
Encrypt an already-built MIME message and return a PGP/MIME message.
|
||||
"""
|
||||
|
||||
# Serialize the original MIME message before encryption.
|
||||
plaintext = message.as_bytes()
|
||||
|
||||
# Binary OpenPGP data is appropriate for application/octet-stream.
|
||||
encrypted = gpg.encrypt(
|
||||
plaintext,
|
||||
recipients=[recipient_fingerprint],
|
||||
armor=False,
|
||||
always_trust=False,
|
||||
)
|
||||
|
||||
if not encrypted.ok:
|
||||
raise RuntimeError(
|
||||
f"GPG encryption failed: {encrypted.status}; "
|
||||
f"stderr: {encrypted.stderr}"
|
||||
)
|
||||
|
||||
encrypted_bytes = encrypted.data
|
||||
|
||||
if not encrypted_bytes:
|
||||
raise RuntimeError("GPG returned an empty encrypted message")
|
||||
|
||||
encrypted_message = MIMEMultipart(
|
||||
"encrypted",
|
||||
protocol="application/pgp-encrypted",
|
||||
)
|
||||
|
||||
# Copy normal mail headers. Content-Type and MIME-Version are generated
|
||||
# automatically for the new multipart/encrypted message.
|
||||
for header in (
|
||||
"From",
|
||||
"To",
|
||||
"Subject",
|
||||
"Message-ID",
|
||||
"Date",
|
||||
"X-Priority",
|
||||
"Importance",
|
||||
"X-Auto-Response-Suppress",
|
||||
"List-Unsubscribe",
|
||||
"List-Unsubscribe-Post",
|
||||
):
|
||||
value = message.get(header)
|
||||
if value is not None:
|
||||
encrypted_message[header] = value
|
||||
|
||||
# Required PGP/MIME version part.
|
||||
version_part = MIMEApplication(
|
||||
b"Version: 1\r\n",
|
||||
_subtype="pgp-encrypted",
|
||||
)
|
||||
version_part.add_header(
|
||||
"Content-Description",
|
||||
"PGP/MIME version identification",
|
||||
)
|
||||
encrypted_message.attach(version_part)
|
||||
|
||||
# Encrypted MIME payload.
|
||||
encrypted_part = MIMEApplication(
|
||||
encrypted_bytes,
|
||||
_subtype="octet-stream",
|
||||
)
|
||||
encrypted_part.add_header(
|
||||
"Content-Description",
|
||||
"OpenPGP encrypted message",
|
||||
)
|
||||
encrypted_part.add_header(
|
||||
"Content-Disposition",
|
||||
"inline",
|
||||
filename="encrypted.asc",
|
||||
)
|
||||
encrypted_message.attach(encrypted_part)
|
||||
|
||||
return encrypted_message
|
||||
|
||||
|
||||
async def create_email_message(
|
||||
to_email: str,
|
||||
subject: str,
|
||||
html_content: str,
|
||||
user_id: Optional[int] = None,
|
||||
user_id: int = None,
|
||||
):
|
||||
"""
|
||||
Create an HTML email.
|
||||
|
||||
If the recipient has a public GPG key in the database, the complete
|
||||
MIME message is encrypted using PGP/MIME.
|
||||
|
||||
Expected database structure:
|
||||
|
||||
{
|
||||
"email": "recipient@example.com",
|
||||
"gnupg": "-----BEGIN PGP PUBLIC KEY BLOCK-----\\n..."
|
||||
}
|
||||
"""
|
||||
|
||||
msg = MIMEMultipart("alternative")
|
||||
|
||||
msg["From"] = f"{FROM_NAME} <{FROM_EMAIL}>"
|
||||
msg["To"] = to_email
|
||||
msg["Subject"] = subject
|
||||
msg["Message-ID"] = make_msgid(
|
||||
domain=FROM_EMAIL.rsplit("@", 1)[1],
|
||||
)
|
||||
msg["Date"] = formatdate(localtime=True)
|
||||
msg["X-Priority"] = "3"
|
||||
msg["Importance"] = "normal"
|
||||
msg["X-Auto-Response-Suppress"] = "All"
|
||||
|
||||
# Do not send unsubscribe headers to yourself.
|
||||
if to_email.lower() != FROM_EMAIL.lower():
|
||||
unsubscribe_url = build_unsubscribe_url(
|
||||
to_email=to_email,
|
||||
user_id=user_id,
|
||||
domain=FULL_DOMAIN,
|
||||
)
|
||||
|
||||
msg["List-Unsubscribe"] = f"<{unsubscribe_url}>"
|
||||
msg["List-Unsubscribe-Post"] = "List-Unsubscribe=One-Click"
|
||||
|
||||
msg.attach(
|
||||
MIMEText(
|
||||
html_content,
|
||||
"html",
|
||||
"utf-8",
|
||||
)
|
||||
)
|
||||
|
||||
# Fetch the recipient's public key.
|
||||
user = await users_collection.find_one(
|
||||
{"email": to_email},
|
||||
{"gnupg": 1},
|
||||
)
|
||||
|
||||
public_key = user.get("gnupg") if user else None
|
||||
|
||||
if not public_key:
|
||||
# Return a normal unencrypted email when no key is available.
|
||||
return msg
|
||||
|
||||
if not isinstance(public_key, str):
|
||||
raise TypeError("The gnupg database field must be a string")
|
||||
|
||||
try:
|
||||
fingerprint = import_public_key(public_key)
|
||||
return encrypt_mime_message(msg, fingerprint)
|
||||
|
||||
except Exception:
|
||||
# Encryption is mandatory whenever a key exists.
|
||||
# Do not silently send the message unencrypted.
|
||||
raise
|
||||
|
||||
msg['From'] = f"{FROM_NAME} <{FROM_EMAIL}>"
|
||||
msg['To'] = to_email
|
||||
msg['Subject'] = subject
|
||||
msg['Message-ID'] = make_msgid(domain=FROM_EMAIL.split('@')[1])
|
||||
msg['Date'] = formatdate(localtime=True)
|
||||
msg['X-Priority'] = "3"
|
||||
msg['Importance'] = "normal"
|
||||
msg['X-Auto-Response-Suppress'] = "All"
|
||||
|
||||
# token = await create_unsubscribe_token(to_email, user_id)
|
||||
unsubscribe_url = build_unsubscribe_url(to_email, None, FULL_DOMAIN)
|
||||
if to_email != FROM_EMAIL:
|
||||
msg['List-Unsubscribe'] = f"<{unsubscribe_url}>"
|
||||
msg['List-Unsubscribe-Post'] = "List-Unsubscribe=One-Click"
|
||||
|
||||
msg.attach(MIMEText(html_content, 'html'))
|
||||
|
||||
return msg
|
||||
|
||||
|
||||
def connect(email_server, email_port):
|
||||
|
||||
264
main.ipynb
264
main.ipynb
@ -180,42 +180,23 @@
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"from typing import Any, AsyncIterator\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"def get_delivery_aggregate(\n",
|
||||
" _filter: dict[str, Any] | None = None,\n",
|
||||
" _status: str | list[str] | None = None,\n",
|
||||
"):\n",
|
||||
"def get_delivery_aggregate(_filter: dict = {}, _status: str = None):\n",
|
||||
" cursor = delivery_collection.aggregate([\n",
|
||||
" {\n",
|
||||
" \"$match\": {\n",
|
||||
" \"prod\": PROD,\n",
|
||||
" **(_filter or {}),\n",
|
||||
" }\n",
|
||||
" },\n",
|
||||
" {\"$match\": {\n",
|
||||
" \"prod\": PROD, **_filter\n",
|
||||
" }},\n",
|
||||
" {\"$sort\": {\"_id\": -1}},\n",
|
||||
" {\n",
|
||||
" \"$group\": {\n",
|
||||
" \"_id\": \"$post_id\",\n",
|
||||
" \"doc\": {\"$first\": \"$$ROOT\"},\n",
|
||||
" }\n",
|
||||
" },\n",
|
||||
" {\"$group\": {\n",
|
||||
" \"_id\": \"$post_id\",\n",
|
||||
" \"doc\": {\"$first\": \"$$ROOT\"}\n",
|
||||
" }},\n",
|
||||
" {\"$replaceRoot\": {\"newRoot\": \"$doc\"}},\n",
|
||||
" {\"$sort\": {\"_id\": -1}},\n",
|
||||
" ])\n",
|
||||
"\n",
|
||||
" if _status is None:\n",
|
||||
" return cursor\n",
|
||||
"\n",
|
||||
" statuses = {_status} if isinstance(_status, str) else set(_status)\n",
|
||||
"\n",
|
||||
" async def filtered_cursor() -> AsyncIterator[dict[str, Any]]:\n",
|
||||
" async for doc in cursor:\n",
|
||||
" if doc.get(\"status\") in statuses:\n",
|
||||
" yield doc\n",
|
||||
"\n",
|
||||
" return filtered_cursor()\n"
|
||||
" if _status:\n",
|
||||
" return (doc async for doc in cursor if doc.get('status') == _status)\n",
|
||||
" else:\n",
|
||||
" return cursor\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
@ -1105,13 +1086,6 @@
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"import hashlib\n",
|
||||
"\n",
|
||||
"def sha256(text: str) -> str:\n",
|
||||
" \"\"\"Server-side SHA-256 (hex)\"\"\"\n",
|
||||
" return hashlib.sha256(text.encode(\"utf-8\")).hexdigest()\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"@app.post(\"/api/login\")\n",
|
||||
"async def login(\n",
|
||||
" request: Request,\n",
|
||||
@ -1122,86 +1096,57 @@
|
||||
" await check_bruteforce(identifier)\n",
|
||||
"\n",
|
||||
" or_conditions = [\n",
|
||||
" {\"email\": identifier},\n",
|
||||
" {\"email\": identifier.lower()},\n",
|
||||
" ]\n",
|
||||
"\n",
|
||||
" {\"email\": identifier},\n",
|
||||
" {\"email\": identifier.lower()},\n",
|
||||
" ]\n",
|
||||
" \n",
|
||||
" try:\n",
|
||||
" normalized_phone = normalize_phone(identifier)\n",
|
||||
" if normalized_phone:\n",
|
||||
" or_conditions.append({\"phone\": normalized_phone})\n",
|
||||
" except Exception:\n",
|
||||
" except:\n",
|
||||
" pass\n",
|
||||
"\n",
|
||||
" users = [doc async for doc in users_collection.find({\"$or\": or_conditions})]\n",
|
||||
"\n",
|
||||
"\n",
|
||||
" if not users:\n",
|
||||
" await increment_failed_attempt(identifier)\n",
|
||||
" raise HTTPException(status_code=401, detail=\"Incorrect credentials\")\n",
|
||||
" raise HTTPException(401, \"Incorrect credentials\")\n",
|
||||
"\n",
|
||||
" matched_user = None\n",
|
||||
" new_hash = None\n",
|
||||
" is_hash_login = login_data.client_id == \"web_hash\"\n",
|
||||
" # Track if a valid password was found\n",
|
||||
" valid_user_found = False\n",
|
||||
"\n",
|
||||
" for user in users:\n",
|
||||
" stored = user.get(\"hashed_password\")\n",
|
||||
"\n",
|
||||
" if isinstance(stored, bytes):\n",
|
||||
" stored = stored.decode()\n",
|
||||
"\n",
|
||||
" if not stored:\n",
|
||||
" continue\n",
|
||||
" # Check if the password is hashed with Argon2\n",
|
||||
" if stored.startswith(\"$argon2\"):\n",
|
||||
" ok = verify_password(login_data.password, stored)\n",
|
||||
" if ok:\n",
|
||||
" valid_user_found = True\n",
|
||||
" break # Password is valid, exit the loop\n",
|
||||
" \n",
|
||||
" # Check if the password is hashed with bcrypt\n",
|
||||
" elif stored.startswith(\"$2y$\"):\n",
|
||||
" stored = stored.replace(\"$2y$\", \"$2b$\", 1)\n",
|
||||
" if bcrypt.checkpw(login_data.password.encode(), stored.encode()):\n",
|
||||
" valid_user_found = True\n",
|
||||
" new_hash = get_password_hash(login_data.password)\n",
|
||||
" break # Password is valid, exit the loop\n",
|
||||
"\n",
|
||||
" # ---------- 1. Client sent SHA-256 hash ----------\n",
|
||||
" if is_hash_login:\n",
|
||||
" # Stored value is expected to be Argon2(SHA256(password))\n",
|
||||
" if stored.startswith(\"$argon2\"):\n",
|
||||
" if verify_password(login_data.password, stored):\n",
|
||||
" matched_user = user\n",
|
||||
" break\n",
|
||||
"\n",
|
||||
" # ---------- 2. Client sent plaintext ----------\n",
|
||||
" else:\n",
|
||||
" # Modern: Argon2(SHA256(plain))\n",
|
||||
" if stored.startswith(\"$argon2\"):\n",
|
||||
" # Try verifying as if stored is Argon2(SHA256(plain))\n",
|
||||
" hashed_input = sha256(login_data.password)\n",
|
||||
" if verify_password(hashed_input, stored):\n",
|
||||
" matched_user = user\n",
|
||||
" break\n",
|
||||
"\n",
|
||||
" # Also try classic Argon2(plain) for very old accounts\n",
|
||||
" if verify_password(login_data.password, stored):\n",
|
||||
" matched_user = user\n",
|
||||
" # Force migration to Argon2(SHA256)\n",
|
||||
" new_hash = get_password_hash(sha256(login_data.password))\n",
|
||||
" break\n",
|
||||
"\n",
|
||||
" # Legacy bcrypt(plain)\n",
|
||||
" elif stored.startswith((\"$2y$\", \"$2b$\", \"$2a$\")):\n",
|
||||
" stored_bcrypt = stored.replace(\"$2y$\", \"$2b$\", 1)\n",
|
||||
" try:\n",
|
||||
" if bcrypt.checkpw(\n",
|
||||
" login_data.password.encode(\"utf-8\"),\n",
|
||||
" stored_bcrypt.encode(\"utf-8\")\n",
|
||||
" ):\n",
|
||||
" matched_user = user\n",
|
||||
" # Migrate to Argon2(SHA256(plain))\n",
|
||||
" new_hash = get_password_hash(sha256(login_data.password))\n",
|
||||
" break\n",
|
||||
" except Exception:\n",
|
||||
" continue\n",
|
||||
"\n",
|
||||
" if not matched_user:\n",
|
||||
" # If no valid user was found, increment attempts and raise error\n",
|
||||
" if not valid_user_found:\n",
|
||||
" await increment_failed_attempt(identifier)\n",
|
||||
" raise HTTPException(status_code=401, detail=\"Incorrect credentials\")\n",
|
||||
" raise HTTPException(401, \"Incorrect credentials\")\n",
|
||||
"\n",
|
||||
" # Apply migration if needed\n",
|
||||
" if new_hash:\n",
|
||||
" await users_collection.update_one(\n",
|
||||
" {\"_id\": matched_user[\"_id\"]},\n",
|
||||
" {\"$set\": {\"hashed_password\": new_hash}}\n",
|
||||
" )\n",
|
||||
" # If we reach this point, authentication succeeded\n",
|
||||
" # Proceed with further logic such as generating tokens or returning user details\n",
|
||||
"\n",
|
||||
" # await users_collection.update_one({\"_id\": user[\"_id\"]}, {\"$set\": {\"hashed_password\": new_hash}})\n",
|
||||
" \n",
|
||||
" await reset_failed_attempts(identifier)\n",
|
||||
"\n",
|
||||
" user_id_str = str(user[\"_id\"])\n",
|
||||
@ -1708,10 +1653,8 @@
|
||||
"):\n",
|
||||
" exhibition = await exhibition_collection.find_one({'_id': ObjectId(exhibition_id)})\n",
|
||||
" if exhibition:\n",
|
||||
" posts = [doc async for doc in get_delivery_aggregate({\"exhibition_id\": exhibition_id}, ['Получено', 'Получено галерей', 'Продано', 'На выставке'])]\n",
|
||||
" for i in posts:\n",
|
||||
" if (post_id:=i.get('post_id')) and 'post' not in i:\n",
|
||||
" i['post'] = await posts_collection.find_one({'_id': ObjectId(post_id)})\n",
|
||||
" posts = [doc async for doc in get_delivery_aggregate({\"exhibition_id\": exhibition_id}, 'На выставке')]\n",
|
||||
" \n",
|
||||
" return templates.TemplateResponse(\n",
|
||||
" request=request, name=\"exhibition/index.html\", context={\"id\": 1, \"user\": user, \"exhibition\": exhibition, \"posts\": posts, 'now': datetime.now()}\n",
|
||||
" )\n",
|
||||
@ -1972,43 +1915,6 @@
|
||||
" )\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"@app.post(\"/api/reset-hash-password\")\n",
|
||||
"async def reset_hash_password_user(\n",
|
||||
" request: Request,\n",
|
||||
" response: Response,\n",
|
||||
" data: ResetPasswordRequest = Body(...),\n",
|
||||
" current_user: Dict = Security(get_current_user)\n",
|
||||
"):\n",
|
||||
" user_id_str = current_user[\"id\"]\n",
|
||||
"\n",
|
||||
" session_key = f\"user_sessions:{user_id_str}\"\n",
|
||||
" tokens = await redis_client.smembers(session_key)\n",
|
||||
" for t in tokens:\n",
|
||||
" await redis_client.delete(t)\n",
|
||||
" await redis_client.delete(session_key)\n",
|
||||
"\n",
|
||||
" for cookie_name in request.cookies.keys():\n",
|
||||
" if cookie_name in ['zoom']:\n",
|
||||
" continue\n",
|
||||
"\n",
|
||||
" for dom in [None,'.kultmost.ru','www.kultmost.ru','avtopost.kultmost.ru','avtopost.kultmost.ru','kultmost.ru']:\n",
|
||||
" response.delete_cookie(\n",
|
||||
" key=cookie_name,\n",
|
||||
" domain=dom,\n",
|
||||
" path=\"/\", \n",
|
||||
" secure=False, \n",
|
||||
" httponly=False,\n",
|
||||
" )\n",
|
||||
" hashed_password = get_password_hash(data.new_password)\n",
|
||||
" \n",
|
||||
" await users_collection.update_one(\n",
|
||||
" {\"_id\": ObjectId(user_id_str)},\n",
|
||||
" {\"$set\": {\"hashed_password\": hashed_password}}\n",
|
||||
" )\n",
|
||||
" \n",
|
||||
" return {\"ok\": True, \"message\": \"Пароль успешно изменён\", \"next\": '/profile'}\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"@router.post(\"/api/reset-password\")\n",
|
||||
"async def reset_password(\n",
|
||||
" data: ResetPasswordRequest = Body(...),\n",
|
||||
@ -3863,8 +3769,6 @@
|
||||
" update_doc[\"status\"] = -1\n",
|
||||
" if payload.date_finish is not None:\n",
|
||||
" update_doc[\"date_finish\"] = payload.date_finish\n",
|
||||
" if datetime.now(timezone.utc) + timedelta(hours=3) > payload.datetime_start and datetime.now(timezone.utc) + timedelta(hours=3) < payload.date_finish:\n",
|
||||
" update_doc[\"status\"] = 0\n",
|
||||
" if payload.address is not None:\n",
|
||||
" await users_collection.update_one(\n",
|
||||
" { \"_id\": ObjectId(current_user[\"_id\"]) },\n",
|
||||
@ -4178,54 +4082,6 @@
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "30acea7c",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"@app.get(\"/b/{bucket_name}/{file_id}/{new_w}/{quality}/{GaussianBlur_radius}\")\n",
|
||||
"async def get_file_with_config(\n",
|
||||
" bucket_name: str,\n",
|
||||
" file_id: str,\n",
|
||||
" new_w: int,\n",
|
||||
" quality: int,\n",
|
||||
" GaussianBlur_radius: int,\n",
|
||||
"):\n",
|
||||
" res = await stream_gridfs_file(file_id, bucket_name)\n",
|
||||
" if res is None:\n",
|
||||
" raise HTTPException(status_code=404, detail=\"File not found\")\n",
|
||||
"\n",
|
||||
" filename, content_type, file_length, iterator = res\n",
|
||||
"\n",
|
||||
" # Собираем все байты файла\n",
|
||||
" data = b\"\".join([chunk async for chunk in iterator()])\n",
|
||||
"\n",
|
||||
" # Обрабатываем\n",
|
||||
" processed = await build_composite(\n",
|
||||
" data,\n",
|
||||
" new_w=new_w,\n",
|
||||
" quality=quality,\n",
|
||||
" GaussianBlur_radius=GaussianBlur_radius,\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" headers = {\n",
|
||||
" \"Content-Disposition\": content_disposition_header(filename, inline=True),\n",
|
||||
" \"Cache-Control\": \"public, max-age=3600\",\n",
|
||||
" \"ETag\": f'\"{bucket_name}:{file_id}:{new_w}:{quality}:{GaussianBlur_radius}\"',\n",
|
||||
" \"Vary\": \"Accept-Encoding\",\n",
|
||||
" \"Content-Length\": str(len(processed.getvalue())),\n",
|
||||
" }\n",
|
||||
"\n",
|
||||
" return StreamingResponse(\n",
|
||||
" processed,\n",
|
||||
" media_type=\"image/webp\",\n",
|
||||
" headers=headers,\n",
|
||||
" )"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
@ -4290,30 +4146,6 @@
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "c7c3772b",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"@app.post(\"/api/admin/delete-user\")\n",
|
||||
"async def delete_user(\n",
|
||||
" payload: DeleteUserRequest,\n",
|
||||
" user: Dict = Security(get_current_user, scopes=[\"admin\"]),\n",
|
||||
"):\n",
|
||||
" try:\n",
|
||||
" result = users_collection.delete_one({\"_id\": ObjectId(payload._id)})\n",
|
||||
" except Exception:\n",
|
||||
" raise HTTPException(status_code=400, detail=\"Неверный ID пользователя\")\n",
|
||||
"\n",
|
||||
" if result.deleted_count == 0:\n",
|
||||
" raise HTTPException(status_code=404, detail=\"Пользователь не найден\")\n",
|
||||
"\n",
|
||||
" return {\"ok\": True}\n"
|
||||
],
|
||||
"display_name": ".venv"
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
@ -4329,7 +4161,7 @@
|
||||
" users = [doc async for doc in users_collection.find().sort({'_id':-1})]\n",
|
||||
" return templates.TemplateResponse(\n",
|
||||
" request=request, name=\"profile/admin/users.html\", context={\"user\": user,\n",
|
||||
" 'users': users\n",
|
||||
" 'users': users \n",
|
||||
" }\n",
|
||||
" )"
|
||||
],
|
||||
@ -5019,8 +4851,8 @@
|
||||
" \n",
|
||||
" data = [doc async for doc in get_delivery_aggregate(_match)]\n",
|
||||
"\n",
|
||||
" exhibitions = await exhibition_collection.find({'_id': {'$in': [ObjectId(i.get('exhibition_id')) for i in data if i.get('exhibition_id')]}}).sort(\"_id\", -1).to_list()\n",
|
||||
" competitions = await competitions_col.find({'_id': {'$in': [i.get('competition_id') for i in data if i.get('competition_id')]}}).sort(\"_id\", -1).to_list()\n",
|
||||
" exhibitions = await exhibition_collection.find({'_id': {'$in': [ObjectId(i.get('exhibition_id')) for i in data if i.get('exhibition_id')]}}).to_list()\n",
|
||||
" competitions = await competitions_col.find({'_id': {'$in': [i.get('competition_id') for i in data if i.get('competition_id')]}}).to_list()\n",
|
||||
" return templates.TemplateResponse(\n",
|
||||
" request=request,\n",
|
||||
" name=\"profile/delivery.html\",\n",
|
||||
|
||||
245
main.py
245
main.py
@ -81,43 +81,24 @@ def transliterate(text: str) -> str:
|
||||
return ''.join(RUS_TO_LAT.get(ch, '' if ch not in string.ascii_letters else ch) for ch in text)
|
||||
|
||||
|
||||
from typing import Any, AsyncIterator
|
||||
|
||||
|
||||
def get_delivery_aggregate(
|
||||
_filter: dict[str, Any] | None = None,
|
||||
_status: str | list[str] | None = None,
|
||||
):
|
||||
def get_delivery_aggregate(_filter: dict = {}, _status: str = None):
|
||||
cursor = delivery_collection.aggregate([
|
||||
{
|
||||
"$match": {
|
||||
"prod": PROD,
|
||||
**(_filter or {}),
|
||||
}
|
||||
},
|
||||
{"$match": {
|
||||
"prod": PROD, **_filter
|
||||
}},
|
||||
{"$sort": {"_id": -1}},
|
||||
{
|
||||
"$group": {
|
||||
"_id": "$post_id",
|
||||
"doc": {"$first": "$$ROOT"},
|
||||
}
|
||||
},
|
||||
{"$group": {
|
||||
"_id": "$post_id",
|
||||
"doc": {"$first": "$$ROOT"}
|
||||
}},
|
||||
{"$replaceRoot": {"newRoot": "$doc"}},
|
||||
{"$sort": {"_id": -1}},
|
||||
])
|
||||
|
||||
if _status is None:
|
||||
if _status:
|
||||
return (doc async for doc in cursor if doc.get('status') == _status)
|
||||
else:
|
||||
return cursor
|
||||
|
||||
statuses = {_status} if isinstance(_status, str) else set(_status)
|
||||
|
||||
async def filtered_cursor() -> AsyncIterator[dict[str, Any]]:
|
||||
async for doc in cursor:
|
||||
if doc.get("status") in statuses:
|
||||
yield doc
|
||||
|
||||
return filtered_cursor()
|
||||
|
||||
|
||||
async def get_latest_news() -> List[dict]:
|
||||
cursor = news_collection.find({'publish_on_platform': True}).sort("_id", -1).limit(30)
|
||||
@ -816,13 +797,6 @@ async def login_token(token: str, request: Request, response: Response):
|
||||
return RedirectResponse(next_url,headers=response.headers)
|
||||
|
||||
|
||||
import hashlib
|
||||
|
||||
def sha256(text: str) -> str:
|
||||
"""Server-side SHA-256 (hex)"""
|
||||
return hashlib.sha256(text.encode("utf-8")).hexdigest()
|
||||
|
||||
|
||||
@app.post("/api/login")
|
||||
async def login(
|
||||
request: Request,
|
||||
@ -833,86 +807,57 @@ async def login(
|
||||
await check_bruteforce(identifier)
|
||||
|
||||
or_conditions = [
|
||||
{"email": identifier},
|
||||
{"email": identifier.lower()},
|
||||
]
|
||||
|
||||
{"email": identifier},
|
||||
{"email": identifier.lower()},
|
||||
]
|
||||
|
||||
try:
|
||||
normalized_phone = normalize_phone(identifier)
|
||||
if normalized_phone:
|
||||
or_conditions.append({"phone": normalized_phone})
|
||||
except Exception:
|
||||
except:
|
||||
pass
|
||||
|
||||
users = [doc async for doc in users_collection.find({"$or": or_conditions})]
|
||||
|
||||
|
||||
if not users:
|
||||
await increment_failed_attempt(identifier)
|
||||
raise HTTPException(status_code=401, detail="Incorrect credentials")
|
||||
raise HTTPException(401, "Incorrect credentials")
|
||||
|
||||
matched_user = None
|
||||
new_hash = None
|
||||
is_hash_login = login_data.client_id == "web_hash"
|
||||
# Track if a valid password was found
|
||||
valid_user_found = False
|
||||
|
||||
for user in users:
|
||||
stored = user.get("hashed_password")
|
||||
|
||||
if isinstance(stored, bytes):
|
||||
stored = stored.decode()
|
||||
|
||||
if not stored:
|
||||
continue
|
||||
# Check if the password is hashed with Argon2
|
||||
if stored.startswith("$argon2"):
|
||||
ok = verify_password(login_data.password, stored)
|
||||
if ok:
|
||||
valid_user_found = True
|
||||
break # Password is valid, exit the loop
|
||||
|
||||
# Check if the password is hashed with bcrypt
|
||||
elif stored.startswith("$2y$"):
|
||||
stored = stored.replace("$2y$", "$2b$", 1)
|
||||
if bcrypt.checkpw(login_data.password.encode(), stored.encode()):
|
||||
valid_user_found = True
|
||||
new_hash = get_password_hash(login_data.password)
|
||||
break # Password is valid, exit the loop
|
||||
|
||||
# ---------- 1. Client sent SHA-256 hash ----------
|
||||
if is_hash_login:
|
||||
# Stored value is expected to be Argon2(SHA256(password))
|
||||
if stored.startswith("$argon2"):
|
||||
if verify_password(login_data.password, stored):
|
||||
matched_user = user
|
||||
break
|
||||
|
||||
# ---------- 2. Client sent plaintext ----------
|
||||
else:
|
||||
# Modern: Argon2(SHA256(plain))
|
||||
if stored.startswith("$argon2"):
|
||||
# Try verifying as if stored is Argon2(SHA256(plain))
|
||||
hashed_input = sha256(login_data.password)
|
||||
if verify_password(hashed_input, stored):
|
||||
matched_user = user
|
||||
break
|
||||
|
||||
# Also try classic Argon2(plain) for very old accounts
|
||||
if verify_password(login_data.password, stored):
|
||||
matched_user = user
|
||||
# Force migration to Argon2(SHA256)
|
||||
new_hash = get_password_hash(sha256(login_data.password))
|
||||
break
|
||||
|
||||
# Legacy bcrypt(plain)
|
||||
elif stored.startswith(("$2y$", "$2b$", "$2a$")):
|
||||
stored_bcrypt = stored.replace("$2y$", "$2b$", 1)
|
||||
try:
|
||||
if bcrypt.checkpw(
|
||||
login_data.password.encode("utf-8"),
|
||||
stored_bcrypt.encode("utf-8")
|
||||
):
|
||||
matched_user = user
|
||||
# Migrate to Argon2(SHA256(plain))
|
||||
new_hash = get_password_hash(sha256(login_data.password))
|
||||
break
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
if not matched_user:
|
||||
# If no valid user was found, increment attempts and raise error
|
||||
if not valid_user_found:
|
||||
await increment_failed_attempt(identifier)
|
||||
raise HTTPException(status_code=401, detail="Incorrect credentials")
|
||||
raise HTTPException(401, "Incorrect credentials")
|
||||
|
||||
# Apply migration if needed
|
||||
if new_hash:
|
||||
await users_collection.update_one(
|
||||
{"_id": matched_user["_id"]},
|
||||
{"$set": {"hashed_password": new_hash}}
|
||||
)
|
||||
# If we reach this point, authentication succeeded
|
||||
# Proceed with further logic such as generating tokens or returning user details
|
||||
|
||||
# await users_collection.update_one({"_id": user["_id"]}, {"$set": {"hashed_password": new_hash}})
|
||||
|
||||
await reset_failed_attempts(identifier)
|
||||
|
||||
user_id_str = str(user["_id"])
|
||||
@ -1279,10 +1224,8 @@ async def exhibition_members(
|
||||
):
|
||||
exhibition = await exhibition_collection.find_one({'_id': ObjectId(exhibition_id)})
|
||||
if exhibition:
|
||||
posts = [doc async for doc in get_delivery_aggregate({"exhibition_id": exhibition_id}, ['Получено', 'Получено галерей', 'Продано', 'На выставке'])]
|
||||
for i in posts:
|
||||
if (post_id:=i.get('post_id')) and 'post' not in i:
|
||||
i['post'] = await posts_collection.find_one({'_id': ObjectId(post_id)})
|
||||
posts = [doc async for doc in get_delivery_aggregate({"exhibition_id": exhibition_id}, 'На выставке')]
|
||||
|
||||
return templates.TemplateResponse(
|
||||
request=request, name="exhibition/index.html", context={"id": 1, "user": user, "exhibition": exhibition, "posts": posts, 'now': datetime.now()}
|
||||
)
|
||||
@ -1489,43 +1432,6 @@ async def restore_page(request: Request, token: str):
|
||||
)
|
||||
|
||||
|
||||
@app.post("/api/reset-hash-password")
|
||||
async def reset_hash_password_user(
|
||||
request: Request,
|
||||
response: Response,
|
||||
data: ResetPasswordRequest = Body(...),
|
||||
current_user: Dict = Security(get_current_user)
|
||||
):
|
||||
user_id_str = current_user["id"]
|
||||
|
||||
session_key = f"user_sessions:{user_id_str}"
|
||||
tokens = await redis_client.smembers(session_key)
|
||||
for t in tokens:
|
||||
await redis_client.delete(t)
|
||||
await redis_client.delete(session_key)
|
||||
|
||||
for cookie_name in request.cookies.keys():
|
||||
if cookie_name in ['zoom']:
|
||||
continue
|
||||
|
||||
for dom in [None,'.kultmost.ru','www.kultmost.ru','avtopost.kultmost.ru','avtopost.kultmost.ru','kultmost.ru']:
|
||||
response.delete_cookie(
|
||||
key=cookie_name,
|
||||
domain=dom,
|
||||
path="/",
|
||||
secure=False,
|
||||
httponly=False,
|
||||
)
|
||||
hashed_password = get_password_hash(data.new_password)
|
||||
|
||||
await users_collection.update_one(
|
||||
{"_id": ObjectId(user_id_str)},
|
||||
{"$set": {"hashed_password": hashed_password}}
|
||||
)
|
||||
|
||||
return {"ok": True, "message": "Пароль успешно изменён", "next": '/profile'}
|
||||
|
||||
|
||||
@router.post("/api/reset-password")
|
||||
async def reset_password(
|
||||
data: ResetPasswordRequest = Body(...),
|
||||
@ -2939,8 +2845,6 @@ async def put_competition(
|
||||
update_doc["status"] = -1
|
||||
if payload.date_finish is not None:
|
||||
update_doc["date_finish"] = payload.date_finish
|
||||
if datetime.now(timezone.utc) + timedelta(hours=3) > payload.datetime_start and datetime.now(timezone.utc) + timedelta(hours=3) < payload.date_finish:
|
||||
update_doc["status"] = 0
|
||||
if payload.address is not None:
|
||||
await users_collection.update_one(
|
||||
{ "_id": ObjectId(current_user["_id"]) },
|
||||
@ -3218,45 +3122,6 @@ async def get_avatar(user_id: str):
|
||||
return StreamingResponse(iterator(), media_type=content_type, headers=headers)
|
||||
|
||||
|
||||
@app.get("/b/{bucket_name}/{file_id}/{new_w}/{quality}/{GaussianBlur_radius}")
|
||||
async def get_file_with_config(
|
||||
bucket_name: str,
|
||||
file_id: str,
|
||||
new_w: int,
|
||||
quality: int,
|
||||
GaussianBlur_radius: int,
|
||||
):
|
||||
res = await stream_gridfs_file(file_id, bucket_name)
|
||||
if res is None:
|
||||
raise HTTPException(status_code=404, detail="File not found")
|
||||
|
||||
filename, content_type, file_length, iterator = res
|
||||
|
||||
# Собираем все байты файла
|
||||
data = b"".join([chunk async for chunk in iterator()])
|
||||
|
||||
# Обрабатываем
|
||||
processed = await build_composite(
|
||||
data,
|
||||
new_w=new_w,
|
||||
quality=quality,
|
||||
GaussianBlur_radius=GaussianBlur_radius,
|
||||
)
|
||||
|
||||
headers = {
|
||||
"Content-Disposition": content_disposition_header(filename, inline=True),
|
||||
"Cache-Control": "public, max-age=3600",
|
||||
"ETag": f'"{bucket_name}:{file_id}:{new_w}:{quality}:{GaussianBlur_radius}"',
|
||||
"Vary": "Accept-Encoding",
|
||||
"Content-Length": str(len(processed.getvalue())),
|
||||
}
|
||||
|
||||
return StreamingResponse(
|
||||
processed,
|
||||
media_type="image/webp",
|
||||
headers=headers,
|
||||
)
|
||||
|
||||
async def unsubscribe_user(
|
||||
email: str,
|
||||
token: Optional[str] = None
|
||||
@ -3313,22 +3178,6 @@ async def unsubscribe(
|
||||
"""
|
||||
|
||||
|
||||
@app.post("/api/admin/delete-user")
|
||||
async def delete_user(
|
||||
payload: DeleteUserRequest,
|
||||
user: Dict = Security(get_current_user, scopes=["admin"]),
|
||||
):
|
||||
try:
|
||||
result = users_collection.delete_one({"_id": ObjectId(payload._id)})
|
||||
except Exception:
|
||||
raise HTTPException(status_code=400, detail="Неверный ID пользователя")
|
||||
|
||||
if result.deleted_count == 0:
|
||||
raise HTTPException(status_code=404, detail="Пользователь не найден")
|
||||
|
||||
return {"ok": True}
|
||||
|
||||
|
||||
@app.get("/profile/admin/users", response_class=HTMLResponse)
|
||||
async def profile_admin_statistics(
|
||||
request: Request,
|
||||
@ -3337,7 +3186,7 @@ async def profile_admin_statistics(
|
||||
users = [doc async for doc in users_collection.find().sort({'_id':-1})]
|
||||
return templates.TemplateResponse(
|
||||
request=request, name="profile/admin/users.html", context={"user": user,
|
||||
'users': users
|
||||
'users': users
|
||||
}
|
||||
)
|
||||
|
||||
@ -3839,8 +3688,8 @@ async def profile_delivery(
|
||||
|
||||
data = [doc async for doc in get_delivery_aggregate(_match)]
|
||||
|
||||
exhibitions = await exhibition_collection.find({'_id': {'$in': [ObjectId(i.get('exhibition_id')) for i in data if i.get('exhibition_id')]}}).sort("_id", -1).to_list()
|
||||
competitions = await competitions_col.find({'_id': {'$in': [i.get('competition_id') for i in data if i.get('competition_id')]}}).sort("_id", -1).to_list()
|
||||
exhibitions = await exhibition_collection.find({'_id': {'$in': [ObjectId(i.get('exhibition_id')) for i in data if i.get('exhibition_id')]}}).to_list()
|
||||
competitions = await competitions_col.find({'_id': {'$in': [i.get('competition_id') for i in data if i.get('competition_id')]}}).to_list()
|
||||
return templates.TemplateResponse(
|
||||
request=request,
|
||||
name="profile/delivery.html",
|
||||
|
||||
@ -70,10 +70,6 @@ class UserLoginForm(OAuth2PasswordRequestForm):
|
||||
pass
|
||||
|
||||
|
||||
class DeleteUserRequest(BaseModel):
|
||||
_id: str
|
||||
|
||||
|
||||
class LoginRequest(BaseModel):
|
||||
identifier: str
|
||||
password: str
|
||||
|
||||
@ -38,4 +38,3 @@ celery[redis]==5.6.3
|
||||
pika==1.3.2
|
||||
pillow==12.1.1
|
||||
pytz
|
||||
python-gnupg
|
||||
|
||||
@ -439,7 +439,6 @@ document.getElementById('preview_poster').src = `/b/competition/${competition.po
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
const competition = JSON.parse({{competition|tojson}})
|
||||
var type = competition.type_;
|
||||
|
||||
function toggleType(clickedId) {
|
||||
|
||||
@ -214,8 +214,7 @@
|
||||
</div>
|
||||
|
||||
</form>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
/* ---------- Utility helpers (removed) ---------- */
|
||||
|
||||
/* Toggle visibility of a block (flex / none) */
|
||||
@ -360,8 +359,7 @@ document.getElementById('address').value = '{{ user.send_address[-1] }}'
|
||||
// @license-end
|
||||
</script>
|
||||
{% endif %}
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
function setTomorrowAtNoon() {
|
||||
const input = document.getElementById('datetime_start');
|
||||
const date_finish = document.getElementById('date_finish');
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
<div class="b_1tx4m">
|
||||
<picture data-link="https://kultmost.ru/artists/{{post.user._id}}" data-label="Все картины автора и стоимость">
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_1tx4m"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
<figcaption class="c_fzh03 b_bp0ws">
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
<div class="b_1tx4m">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_1tx4m"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
<figcaption class="c_fzh03 b_bp0ws">
|
||||
@ -107,7 +107,7 @@
|
||||
<div class="b_1tx4m">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_1tx4m"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
<figcaption class="c_fzh03 b_bp0ws">
|
||||
|
||||
@ -54,8 +54,7 @@
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
async function logout() {
|
||||
try {
|
||||
const resp = await fetch('/logout', {
|
||||
@ -74,8 +73,7 @@
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
async function switchProfile() {
|
||||
try {
|
||||
const resp = await fetch('/api/switch-profile', {
|
||||
@ -91,8 +89,7 @@
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const avatarInput = document.getElementById('avatar');
|
||||
const preview = document.getElementById('preview');
|
||||
|
||||
@ -58,14 +58,16 @@
|
||||
<h2>{{ data.post.title }}</h2>
|
||||
<h2>{{ data.post.author }}</h2>
|
||||
<h2>{{ data.post.grade }}</h2>
|
||||
|
||||
</div>
|
||||
<div class="content">
|
||||
|
||||
<div class="gallery">
|
||||
{% for img in data.post.medias %}
|
||||
<img src="https://avtopost.kultmost.ru/b/posts/{{ img }}" alt="Gallery Image" crossorigin="anonymous" fetchpriority="high" loading="eager">
|
||||
{% endfor %}
|
||||
<span>На Культмост добавлена новая картина 🖼</span>
|
||||
: <a href="https://kultmost.ru/post/{{ data.post._id }}">Посмотреть</a>
|
||||
<!-- : <a href="https://kultmost.ru/post/{{ data.post.id }}">Посмотреть</a> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
|
||||
@ -92,12 +92,11 @@
|
||||
<div class="c_cnedr">
|
||||
{% for doc in posts %}
|
||||
{% set post=doc.get('post')%}
|
||||
{% if post %}
|
||||
<figure class="c_g5532 b_wcxt0">
|
||||
<div class="b_1tx4m">
|
||||
<picture data-link="https://kultmost.ru/artists/{{post.get('user',{}).get('_id')}}" data-label="Все картины автора и стоимость">
|
||||
<picture data-link="https://kultmost.ru/artists/{{post.user._id}}" data-label="Все картины автора и стоимость">
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_1tx4m"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
<figcaption class="c_fzh03 b_bp0ws">
|
||||
@ -124,7 +123,6 @@
|
||||
<p class="c_tn4fi b_vjrwu">{{ (post._id.generation_time.strftime('%d.%m.%Y')) if post._id else ''}}</p>
|
||||
</figcaption>
|
||||
</figure>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
</div>
|
||||
|
||||
@ -215,8 +215,7 @@ document.getElementById('place').value = '{{ user.places[-1] }}'
|
||||
// @license-end
|
||||
</script>
|
||||
{% endif %}
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
/* ---------- Utility helpers (removed) ---------- */
|
||||
|
||||
/* Toggle visibility of a block (flex / none) */
|
||||
@ -371,8 +370,7 @@ function bindLinkValidation({
|
||||
// @license-end
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
function setTomorrowAtNoon() {
|
||||
const input = document.getElementById('datetime_start');
|
||||
const date_finish = document.getElementById('date_finish');
|
||||
@ -393,8 +391,7 @@ function bindLinkValidation({
|
||||
setTomorrowAtNoon();
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
|
||||
const titleInput = document.getElementById('title');
|
||||
const topicInput = document.getElementById('topic');
|
||||
|
||||
@ -166,8 +166,7 @@
|
||||
</article>
|
||||
</div>
|
||||
</form>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
function toggleBlock(id, show) {
|
||||
document.querySelector(id).style.display = show ? 'flex' : 'none';
|
||||
document.querySelector(id).querySelector('input').required = show ? true : false;
|
||||
@ -296,8 +295,7 @@ bindLinkValidation({
|
||||
});
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
function setTomorrowAtNoon() {
|
||||
const input = document.getElementById('datetime_start');
|
||||
const date_finish = document.getElementById('date_finish');
|
||||
@ -318,8 +316,7 @@ bindLinkValidation({
|
||||
setTomorrowAtNoon();
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
|
||||
const exhibition = JSON.parse({{exhibition|tojson}})
|
||||
const exhibitionId = exhibition._id
|
||||
|
||||
@ -27,8 +27,7 @@
|
||||
{{ articles.section(news) }}
|
||||
{{ footer.section(user) }}
|
||||
{% if pwa %}
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script async>
|
||||
fetch('/api/me')
|
||||
.then(response => {
|
||||
if (response.ok) {
|
||||
|
||||
@ -72,24 +72,6 @@ function sendToNextPage(e) {
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
async function getSHA256Hash(message) {
|
||||
const encoder = new TextEncoder();
|
||||
const msgBuffer = encoder.encode(message);
|
||||
|
||||
const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer);
|
||||
|
||||
const hashArray = Array.from(new Uint8Array(hashBuffer));
|
||||
|
||||
const hashHex = hashArray
|
||||
.map(b => b.toString(16).padStart(2, '0'))
|
||||
.join('');
|
||||
|
||||
return hashHex;
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const emailInput = document.getElementById('email');
|
||||
@ -132,84 +114,46 @@ async function getSHA256Hash(message) {
|
||||
return;
|
||||
}
|
||||
|
||||
const identifier = emailInput ? emailInput.value.trim() : '';
|
||||
const plainPassword = passwordInput ? passwordInput.value : '';
|
||||
|
||||
if (!identifier || !plainPassword) return;
|
||||
|
||||
// No client-side validation errors — send request
|
||||
try {
|
||||
// 1. First attempt: send SHA-256 hash with client_id = 'web_hash'
|
||||
const hash = await getSHA256Hash(plainPassword);
|
||||
console.log('Trying with hash:', hash); // for debug, remove later
|
||||
const payload = {
|
||||
identifier: emailInput ? emailInput.value : '',
|
||||
password: passwordInput ? passwordInput.value : '',
|
||||
client_id: 'web'
|
||||
};
|
||||
|
||||
let res = await fetch('/api/login', {
|
||||
const res = await fetch('/api/login', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
credentials: 'include',
|
||||
body: JSON.stringify({
|
||||
identifier: identifier,
|
||||
password: hash,
|
||||
client_id: 'web_hash'
|
||||
})
|
||||
body: JSON.stringify(payload)
|
||||
});
|
||||
|
||||
// 2. If hash attempt failed → try plain password with client_id = 'web'
|
||||
if (!res.ok && res.status === 401) {
|
||||
console.log('Hash login failed, trying plain password...');
|
||||
res = await fetch('/api/login', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
credentials: 'include',
|
||||
body: JSON.stringify({
|
||||
identifier: identifier,
|
||||
password: plainPassword,
|
||||
client_id: 'web'
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
// 3. Handle final result
|
||||
if (res.ok) {
|
||||
// success (HTTP 2xx). Redirect to /form
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const next = params.get('next') || '/profile';
|
||||
window.location.href = next;
|
||||
return;
|
||||
}
|
||||
|
||||
// Error handling
|
||||
const allFields = document.querySelectorAll('.floating-group');
|
||||
let msg;
|
||||
|
||||
if (res.status === 403) {
|
||||
msg = 'Ваш аккаунт заблокирован администратором.';
|
||||
try {
|
||||
const d = await res.json();
|
||||
if (d && typeof d.detail === 'string') msg = d.detail;
|
||||
} catch (_) {}
|
||||
allFields.forEach(g => g.classList.remove('error'));
|
||||
} else {
|
||||
msg = 'Неверный логин или пароль';
|
||||
allFields.forEach(g => g.classList.add('error'));
|
||||
const allFields = document.querySelectorAll('.floating-group');
|
||||
let msg;
|
||||
if (res.status === 403) {
|
||||
// Аккаунт заблокирован — поля ввода ни при чём, показываем причину
|
||||
msg = 'Ваш аккаунт заблокирован администратором.';
|
||||
try { const d = await res.json(); if (d && typeof d.detail === 'string') msg = d.detail; } catch (e) {}
|
||||
allFields.forEach(g => g.classList.remove('error'));
|
||||
} else {
|
||||
msg = 'Неверный логин или пароль';
|
||||
allFields.forEach(g => g.classList.add('error'));
|
||||
}
|
||||
if (typeof showToast === 'function') showToast({ message: msg, status: 'error', duration: 9000 });
|
||||
}
|
||||
|
||||
if (typeof showToast === 'function') {
|
||||
showToast({ message: msg, status: 'error', duration: 9000 });
|
||||
}
|
||||
|
||||
} catch (err) {
|
||||
console.error('Request failed', err);
|
||||
// Network or other unexpected error — mark fields as error
|
||||
const allFields = document.querySelectorAll('.floating-group');
|
||||
allFields.forEach(g => g.classList.add('error'));
|
||||
|
||||
if (typeof showToast === 'function') {
|
||||
showToast({
|
||||
message: 'Ошибка сети. Попробуйте позже.',
|
||||
status: 'error',
|
||||
duration: 9000
|
||||
});
|
||||
}
|
||||
console.error('Request failed', err);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
// Убираем красную подсветку сразу при исправлении пользователем
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<a href="/paintings/{{post._id}}" class="b_kbsvf">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_ya0t5"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</a>
|
||||
</div>
|
||||
@ -84,7 +84,7 @@ picture>img{ width: 100%; object-fit: scale-down; }
|
||||
.b_rhbo8 { color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.b_tbfd3 { color: rgba(58, 58, 58, 0.75); font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; text-align: right; }
|
||||
.b_gagrr { align-items: center; align-self: stretch; display: flex; justify-content: space-between; }
|
||||
.b_kbsvf { align-items: center; align-self: stretch; display: flex; flex-direction: column; gap: 10px; justify-content: center; }
|
||||
.b_kbsvf { align-items: flex-start; align-self: stretch; display: flex; flex-direction: column; gap: 10px; justify-content: center; }
|
||||
.b_h57rq { align-items: flex-start; background: #FDFAFF; border-radius: 5px; border: 1px solid #5F1798; box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.25), 0 4px 20px 0 rgba(0, 0, 0, 0.20); display: flex; flex-direction: column; width: 335px; }
|
||||
.c_jy9j2{padding: 10px 20px; height: 226px;}
|
||||
/* Mobile */
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
{% block title %}Пользователи{% endblock %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
{{ header.section(user) }}
|
||||
<section class="c_dg3k4">
|
||||
@ -15,7 +16,22 @@
|
||||
<div class="c_ru432">
|
||||
{{ profile_nav.profile_nav(user, 'users') }}
|
||||
<div class="c_tihtk" id="main">
|
||||
|
||||
|
||||
|
||||
<style>
|
||||
input { padding: 8px; width: 300px; margin-bottom: 10px; border-bottom: 1px solid #5f1798;position: sticky;
|
||||
left: 10px;}
|
||||
table { width: 100%; border-collapse: collapse; }
|
||||
th, td { border: 1px solid #ccc; padding: 8px; text-align: left; }
|
||||
th { background-color: #f4f4f4; }
|
||||
tr.hidden { display: none; }
|
||||
.highlight { background-color: #ffeb3b; padding: 2px 4px; border-radius: 3px; }
|
||||
</style>
|
||||
|
||||
|
||||
<input type="text" id="searchInput" placeholder="Поиск ..." onkeyup="searchTable()">
|
||||
|
||||
<table id="dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -26,7 +42,6 @@
|
||||
<th>Телефон</th>
|
||||
<th>Место проживания</th>
|
||||
<th>Дата рождения</th>
|
||||
<th>...</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -39,37 +54,12 @@
|
||||
<td>{{doc.phone or ""}}</td>
|
||||
<td>{{doc.living_place or ""}}</td>
|
||||
<td>{{doc.birthday or ""}}</td>
|
||||
<td><button class="ba" onclick="deleteUser('{{doc._id}}')">Удалить</button></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
async function deleteUser(params) {
|
||||
try {
|
||||
const res = await fetch('/api/admin/delete-user', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
_id: params,
|
||||
})
|
||||
});
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
if (res.ok) {
|
||||
showToast({ message: "Пользователь удален", status: 'success' });
|
||||
} else {
|
||||
showToast({ message: data.detail || "Ошибка", status: 'error' });
|
||||
}
|
||||
} catch (err) {
|
||||
showToast({ message: "Ошибка соединения с сервером", status: 'error' });
|
||||
}
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
function normalizeText(str) {
|
||||
return str
|
||||
@ -118,10 +108,15 @@ function normalizeText(str) {
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{{ footer.section(user) }}
|
||||
{% endblock %}
|
||||
|
||||
@ -129,42 +124,6 @@ function normalizeText(str) {
|
||||
{{ header.style() }}
|
||||
{{ profile_nav.style() }}
|
||||
{{ footer.style() }}
|
||||
<style>
|
||||
input {
|
||||
padding: 8px;
|
||||
width: 300px;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1px solid #5f1798;
|
||||
position: sticky;
|
||||
left: 10px;
|
||||
}
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
th,
|
||||
td {
|
||||
border: 1px solid #ccc;
|
||||
padding: 8px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
th {
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
|
||||
tr.hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.highlight {
|
||||
background-color: #ffeb3b;
|
||||
padding: 2px 4px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
@media (max-width: 699px) {
|
||||
.c_tihtk {
|
||||
@ -172,14 +131,5 @@ function normalizeText(str) {
|
||||
justify-content: unset;
|
||||
}
|
||||
}
|
||||
td>button{padding: 13px 15px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 5px;
|
||||
background: #5F1798;
|
||||
color: white;
|
||||
display: flex;
|
||||
margin: 4px 0;
|
||||
font-size: 13px;}
|
||||
</style>
|
||||
{% endblock %}
|
||||
@ -139,8 +139,7 @@ document.querySelectorAll('.post').forEach(postEl => {
|
||||
// @license-end
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
const min_paintings = parseInt('{{competition.min_paintings}}')
|
||||
const max_paintings = parseInt('{{competition.max_paintings}}')
|
||||
const competition_id = '{{competition._id}}'
|
||||
@ -374,8 +373,7 @@ function loadAndClick() {
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
loadAndClick();
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const avatarInput = document.getElementById('avatar');
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="b_1vs97">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_1vs97"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
<figcaption class="c_dvi1x b_is70q">
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
{% elif 'Получено' in (doc.status or '') %}
|
||||
{% elif doc.status == 'Получено' %}
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
@ -101,115 +101,99 @@
|
||||
<div class="c_ru432">
|
||||
{{ profile_nav.profile_nav(user, 'delivery') }}
|
||||
<div class="c_tihtk" id="main">
|
||||
<!-- <details>
|
||||
<summary>Конкурсы</summary>
|
||||
<div class="c_tihtk"> -->
|
||||
{% for competition in competitions %}
|
||||
<article class="c_9fgdh b_ax8vz" id="l{{competition._id}}">
|
||||
<a href="/profile/delivery/competition/{{competition._id}}#main">
|
||||
<div class="b_ornr9">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ competition.title }}" class="b_ornr9"
|
||||
src="/b/competition/{{ competition.poster_file_id }}">
|
||||
</picture>
|
||||
</div>
|
||||
</a>
|
||||
{% for competition in competitions %}
|
||||
<article class="c_9fgdh b_ax8vz" id="l{{competition._id}}">
|
||||
<a href="/profile/delivery/competition/{{competition._id}}#main">
|
||||
<div class="b_ornr9">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ competition.title }}" class="b_ornr9" src="/b/competition/{{ competition.poster_file_id }}">
|
||||
</picture>
|
||||
</div>
|
||||
</a>
|
||||
<div class="c_z3dpx b_73p10">
|
||||
<a href="/profile/delivery/competition/{{competition._id}}#main" class="b_73p10">
|
||||
<a href="/profile/delivery/competition/{{competition._id}}#main" class="b_73p10">
|
||||
<div class="b_vabj9_2">
|
||||
<span class="b_0jst1_2">Конкурс</span>
|
||||
<span class="b_0jst1_2">Конкурс</span>
|
||||
</div>
|
||||
{% if competition.get('status',-1) == 2 %}
|
||||
<div class="b_vabj9_2">
|
||||
<span class="b_0jst1_2">Закончился</span>
|
||||
<span class="b_0jst1_2">Закончился</span>
|
||||
</div>
|
||||
{% elif competition.get('status',-1) == 1 %}
|
||||
<div class="b_vabj9_2">
|
||||
<span class="b_0jst1_2">Идет отбор</span>
|
||||
<span class="b_0jst1_2">Идет отбор</span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="b_vabj9">
|
||||
<span class="b_0jst1">{{ {-1:'Формируется',0:'Прием заявок',1:'Идет
|
||||
отбор',2:'Закончился'}[competition.get('status',-1)] }}</span>
|
||||
<span class="b_0jst1">{{ {-1:'Формируется',0:'Прием заявок',1:'Идет отбор',2:'Закончился'}[competition.get('status',-1)] }}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
<header class="c_m876y b_9xtz9">
|
||||
<h3 class="c_hysjg b_8f3uh" style="color: #222;">{{ competition.title }}</h3>
|
||||
<h3 class="c_hysjg b_8f3uh" style="color: #222;">{{ competition.title }}</h3>
|
||||
</header>
|
||||
<p class="c_2fr39 b_tfnz2">{{ competition.topic }}</p>
|
||||
{% if profile %}
|
||||
<button class="c_aq9et">
|
||||
<span class="c_som9s">Посмотреть заявки</span>
|
||||
<span class="c_som9s">Посмотреть заявки</span>
|
||||
</button>
|
||||
{% else %}
|
||||
{% set user = competition.get('user') %}
|
||||
<div class="c_dbbe4 b_otttb">
|
||||
{% if user %}
|
||||
<img class="c_pm80w b_a68fq" src="/a/{{user._id}}" alt="{{ user.username | e }}" crossorigin="anonymous"
|
||||
fetchpriority="high" loading="eager">
|
||||
<div class="c_4402p b_ntazj">
|
||||
<p class="c_kvah4 b_ghosy">{{ user.username | e }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user %}
|
||||
<img class="c_pm80w b_a68fq" src="/a/{{user._id}}" alt="{{ user.username | e }}" crossorigin="anonymous" fetchpriority="high" loading="eager">
|
||||
<div class="c_4402p b_ntazj">
|
||||
<p class="c_kvah4 b_ghosy">{{ user.username | e }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<p class="c_2fr39 b_tfnz2">Подробнее</p>
|
||||
{% endif %}
|
||||
</a>
|
||||
<p class="c_drpqj b_mp1wb">{{ (competition.datetime_start.strftime('%d.%m.%Y')) if competition.datetime_start else
|
||||
''}}</p>
|
||||
</a>
|
||||
<p class="c_drpqj b_mp1wb">{{ (competition.datetime_start.strftime('%d.%m.%Y')) if competition.datetime_start else ''}}</p>
|
||||
</div>
|
||||
</article>
|
||||
{% endfor %}
|
||||
<!-- </div>
|
||||
</details>
|
||||
<details open>
|
||||
<summary>Выставки</summary>
|
||||
<div class="c_tihtk"> -->
|
||||
{% for i in exhibitions %}
|
||||
<article class="c_9fgdh b_ax8vz">
|
||||
<a href="/profile/delivery/exhibition/{{i._id}}#main">
|
||||
<div class="b_ornr9">
|
||||
<picture>
|
||||
<img src="/b/exhibition/{{i.poster_file_id}}" data-src="/b/exhibition/{{i.poster_orig_id}}" id="preview_poster"
|
||||
crossorigin="anonymous" fetchpriority="high" loading="eager" alt="Загрузите афишу" class="b_ornr9">
|
||||
</picture>
|
||||
</div>
|
||||
</a>
|
||||
<div class="c_z3dpx b_73p10">
|
||||
<a class="b_73p10" href="/profile/delivery/exhibition/{{i._id}}#main">
|
||||
<div class="b_vabj9_2">
|
||||
<span class="b_0jst1_2">Выставка</span>
|
||||
</div>
|
||||
<div class="c_c4wam b_vabj9">
|
||||
{% if now > i.date_finish %}
|
||||
<span class="c_95csi b_0jst1">Закончилась</span>
|
||||
{% elif now > i.datetime_start %}
|
||||
<span class="c_95csi b_0jst1">Началась</span>
|
||||
{% else %}
|
||||
<span class="c_95csi b_0jst1">Формируется</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<header class="c_m876y b_9xtz9">
|
||||
<h3 class="c_hysjg b_8f3uh" id="preview_title" style="color: #222;">{{i.title}}</h3>
|
||||
</header>
|
||||
<p class="c_2fr39 b_tfnz2" id="preview_topic">{{i.topic}}</p>
|
||||
<div class="c_dbbe4 b_otttb">
|
||||
{% if user %}
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" class="c_pm80w b_a68fq"
|
||||
src="/a/{{i.user._id}}" alt="{{ i.user.username | e }}">
|
||||
<div class="c_4402p b_ntazj">
|
||||
<p class="c_kvah4 b_ghosy">{{ i.user.username }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<p class="c_2fr39 b_tfnz2">Подробнее</p>
|
||||
</a>
|
||||
<p class="c_drpqj b_mp1wb">{{ ( i._id.generation_time.strftime('%d.%m.%Y')) if i._id else ''}}</p>
|
||||
</div>
|
||||
</article>
|
||||
{% endfor %}
|
||||
<!-- </div>
|
||||
</details> -->
|
||||
</article>
|
||||
{% endfor %}
|
||||
{% for i in exhibitions %}
|
||||
<article class="c_9fgdh b_ax8vz">
|
||||
<a href="/profile/delivery/exhibition/{{i._id}}#main">
|
||||
<div class="b_ornr9">
|
||||
<picture>
|
||||
<img src="/b/exhibition/{{i.poster_file_id}}" data-src="/b/exhibition/{{i.poster_orig_id}}" id="preview_poster" crossorigin="anonymous" fetchpriority="high" loading="eager" alt="Загрузите афишу" class="b_ornr9">
|
||||
</picture>
|
||||
</div>
|
||||
</a>
|
||||
<div class="c_z3dpx b_73p10">
|
||||
<a class="b_73p10" href="/profile/delivery/exhibition/{{i._id}}#main">
|
||||
<div class="b_vabj9_2">
|
||||
<span class="b_0jst1_2">Выставка</span>
|
||||
</div>
|
||||
<div class="c_c4wam b_vabj9">
|
||||
{% if now > i.date_finish %}
|
||||
<span class="c_95csi b_0jst1">Закончилась</span>
|
||||
{% elif now > i.datetime_start %}
|
||||
<span class="c_95csi b_0jst1">Началась</span>
|
||||
{% else %}
|
||||
<span class="c_95csi b_0jst1">Формируется</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<header class="c_m876y b_9xtz9">
|
||||
<h3 class="c_hysjg b_8f3uh" id="preview_title" style="color: #222;">{{i.title}}</h3>
|
||||
</header>
|
||||
<p class="c_2fr39 b_tfnz2" id="preview_topic">{{i.topic}}</p>
|
||||
<div class="c_dbbe4 b_otttb">
|
||||
{% if user %}
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" class="c_pm80w b_a68fq" src="/a/{{i.user._id}}" alt="{{ i.user.username | e }}">
|
||||
<div class="c_4402p b_ntazj">
|
||||
<p class="c_kvah4 b_ghosy">{{ i.user.username }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<p class="c_2fr39 b_tfnz2">Подробнее</p>
|
||||
</a>
|
||||
<p class="c_drpqj b_mp1wb">{{ ( i._id.generation_time.strftime('%d.%m.%Y')) if i._id else ''}}</p>
|
||||
</div>
|
||||
</article>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -224,7 +208,6 @@
|
||||
{{ profile_nav.style() }}
|
||||
{{card.style()}}
|
||||
<style>
|
||||
summary{ text-align: center; font-size: 24px; color: #5f1798; font-weight: bold; width: 100%; }
|
||||
/* Base (common) styles */
|
||||
.c_aihm6{width: 100%;}
|
||||
.mw{margin: 0 20px;
|
||||
@ -245,7 +228,7 @@ picture > img {
|
||||
}
|
||||
.b_kbsvf {
|
||||
padding: 10px 20px;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
align-self: stretch;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">Запрос на отправку</span>
|
||||
</div>
|
||||
{% elif 'Получено' in (doc.status or '') %}
|
||||
{% elif doc.status == 'Получено' %}
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
@ -150,7 +150,7 @@ picture > img {
|
||||
}
|
||||
.b_kbsvf {
|
||||
padding: 10px 20px;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
align-self: stretch;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
{% elif 'Получено' in (doc.status or '') %}
|
||||
{% elif doc.status == 'Получено' %}
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
@ -539,8 +539,7 @@
|
||||
});
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
function toggleTrackField() {
|
||||
const deliveryType = document.getElementById('delivery_type');
|
||||
const trackGroup = document.getElementById('track-group');
|
||||
@ -644,7 +643,7 @@ picture > img {
|
||||
}
|
||||
.b_kbsvf {
|
||||
padding: 10px 20px;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
align-self: stretch;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -7,37 +7,39 @@
|
||||
{% block title %}Анкета{% endblock %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
{{ header.section(user) }}
|
||||
<section class="c_dg3k4">
|
||||
<div class="c_gtoe9">
|
||||
{{ profile_card.profile_card(user) }}
|
||||
<div class="c_ru432">
|
||||
{{ profile_nav.profile_nav(user, 'form') }}
|
||||
<div class="c_tihtk" id="main">
|
||||
|
||||
<div class="c_gtoe9">
|
||||
{{ profile_card.profile_card(user) }}
|
||||
<div class="c_ru432">
|
||||
{{ profile_nav.profile_nav(user, 'form') }}
|
||||
<div class="c_tihtk" id="main">
|
||||
<div class="c_aihm6 floating-group">
|
||||
<label for="female_name_lastname" class="c_z3ybu floating-label">ФИО<span style="color:red">*</span></label>
|
||||
<input name="female_name_lastname" id="female_name_lastname" class="c_xhd5k" required />
|
||||
<span></span>
|
||||
</div>
|
||||
|
||||
<label for="birthday" class="c_z3ybu floating-label">Дата рождения<span style="color:red">*</span></label>
|
||||
|
||||
<label for="birthday" class="c_z3ybu floating-label">Дата рождения<span style="color:red">*</span></label>
|
||||
|
||||
<div class="c_aihm6 floating-group birthday">
|
||||
<select id="day">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
</select>
|
||||
<select id="month">
|
||||
<option>Январь</option>
|
||||
<option>Февраль</option>
|
||||
</select>
|
||||
<select id="year">
|
||||
<option>2000</option>
|
||||
<option>2001</option>
|
||||
</select>
|
||||
<input type="date" id="birthday" name="birthday" class="c_xhd5k" required data-toast="Поле Дата рождения должно быть заполнено">
|
||||
</div>
|
||||
<select id="day">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
</select>
|
||||
<select id="month">
|
||||
<option>Январь</option>
|
||||
<option>Февраль</option>
|
||||
</select>
|
||||
<select id="year">
|
||||
<option>2000</option>
|
||||
<option>2001</option>
|
||||
</select>
|
||||
<input type="date" id="birthday" name="birthday" class="c_xhd5k" required data-toast="Поле Дата рождения должно быть заполнено">
|
||||
</div>
|
||||
|
||||
<div class="c_aihm6 floating-group">
|
||||
<label for="living_place" class="c_z3ybu floating-label">Место проживания<span style="color:red">*</span></label>
|
||||
@ -63,12 +65,6 @@
|
||||
<span></span>
|
||||
</div>
|
||||
|
||||
<div class="c_nb6gy floating-group">
|
||||
<label for="gnupg" class="c_z3ybu floating-label">GnuPG</label>
|
||||
<textarea type="text" id="gnupg" name="gnupg" class="c_4ykpn" ></textarea>
|
||||
<span>Самозащита электронной почты</span>
|
||||
</div>
|
||||
|
||||
<div class="c_aihm6 floating-group">
|
||||
<label for="phone" class="c_z3ybu floating-label">Телефон<span style="color:red">*</span></label>
|
||||
<input name="phone" id="phone" class="c_xhd5k" required />
|
||||
@ -228,7 +224,6 @@ document.getElementById('living_place').value = `{% if user.get('living_place')
|
||||
document.getElementById('social_media').value = `{% if user.get('social_media') is not none %}{{user.get('social_media','') }}{% endif %}`
|
||||
document.getElementById('marketplaces').value = `{% if user.get('marketplaces') is not none %}{{user.get('marketplaces','') }}{% endif %}`
|
||||
document.getElementById('email').value = `{% if user.get('email') is not none %}{{user.get('email','') }}{% endif %}`
|
||||
document.getElementById('gnupg').value = `{% if user.get('gnupg') is not none %}{{user.get('gnupg','') }}{% endif %}`
|
||||
document.getElementById('phone').value = `{% if user.get('phone') is not none %}{{user.get('phone','') }}{% endif %}`
|
||||
document.getElementById('messengers').value = `{% if user.get('messengers') is not none %}{{user.get('messengers','') }}{% endif %}`
|
||||
document.getElementById('specialization').value = `{% if user.get('specialization') is not none %}{{user.get('specialization','') }}{% endif %}`
|
||||
@ -263,78 +258,82 @@ document.addEventListener("DOMContentLoaded",()=>{let e=document.getElementById(
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const createBtn = document.getElementById('createBtn');
|
||||
|
||||
createBtn.addEventListener('click', async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
payload = {
|
||||
'female_name_lastname': document.getElementById('female_name_lastname').value,
|
||||
'birthday': document.getElementById('birthday').value,
|
||||
'living_place': document.getElementById('living_place').value,
|
||||
'social_media': document.getElementById('social_media').value,
|
||||
'marketplaces': document.getElementById('marketplaces').value,
|
||||
'email': document.getElementById('email').value,
|
||||
'gnupg': document.getElementById('gnupg').value,
|
||||
'phone': document.getElementById('phone').value,
|
||||
'messengers': document.getElementById('messengers').value,
|
||||
'specialization': document.getElementById('specialization').value,
|
||||
'grade': document.getElementById('grade').value,
|
||||
'style': document.getElementById('style').value,
|
||||
'art_types': document.getElementById('art_types').value,
|
||||
'genres': document.getElementById('genres').value,
|
||||
'education': document.getElementById('education').value,
|
||||
'unions': document.getElementById('unions').value,
|
||||
'rewards': document.getElementById('rewards').value,
|
||||
'projects': document.getElementById('projects').value,
|
||||
'publications': document.getElementById('publications').value,
|
||||
'site': document.getElementById('site').value,
|
||||
'material_manufacturer': document.getElementById('material_manufacturer').value,
|
||||
'material_use': document.getElementById('material_use').value,
|
||||
'buying_materials': document.getElementById('buying_materials').value,
|
||||
'collaborate': document.getElementById('collaborate').value,
|
||||
'meta_data.wishes': document.getElementById('meta_data.wishes').value,
|
||||
'master_classes': document.getElementById('master_classes').value,
|
||||
'materials_use_in_master_classes': document.getElementById('materials_use_in_master_classes').value,
|
||||
'print_merch': document.getElementById('print_merch').value,
|
||||
'own_workshop': document.getElementById('own_workshop').value,
|
||||
'workshop_tour': document.getElementById('workshop_tour').value,
|
||||
'biography': document.getElementById('biography').value
|
||||
}
|
||||
payload = {
|
||||
'female_name_lastname': document.getElementById('female_name_lastname').value,
|
||||
'birthday': document.getElementById('birthday').value,
|
||||
'living_place': document.getElementById('living_place').value,
|
||||
'social_media': document.getElementById('social_media').value,
|
||||
'marketplaces': document.getElementById('marketplaces').value,
|
||||
'email': document.getElementById('email').value,
|
||||
'phone': document.getElementById('phone').value,
|
||||
'messengers': document.getElementById('messengers').value,
|
||||
'specialization': document.getElementById('specialization').value,
|
||||
'grade': document.getElementById('grade').value,
|
||||
'style': document.getElementById('style').value,
|
||||
'art_types': document.getElementById('art_types').value,
|
||||
'genres': document.getElementById('genres').value,
|
||||
'education': document.getElementById('education').value,
|
||||
'unions': document.getElementById('unions').value,
|
||||
'rewards': document.getElementById('rewards').value,
|
||||
'projects': document.getElementById('projects').value,
|
||||
'publications': document.getElementById('publications').value,
|
||||
'site': document.getElementById('site').value,
|
||||
'material_manufacturer': document.getElementById('material_manufacturer').value,
|
||||
'material_use': document.getElementById('material_use').value,
|
||||
'buying_materials': document.getElementById('buying_materials').value,
|
||||
'collaborate': document.getElementById('collaborate').value,
|
||||
'meta_data.wishes': document.getElementById('meta_data.wishes').value,
|
||||
'master_classes': document.getElementById('master_classes').value,
|
||||
'materials_use_in_master_classes': document.getElementById('materials_use_in_master_classes').value,
|
||||
'print_merch': document.getElementById('print_merch').value,
|
||||
'own_workshop': document.getElementById('own_workshop').value,
|
||||
'workshop_tour': document.getElementById('workshop_tour').value,
|
||||
'biography': document.getElementById('biography').value}
|
||||
|
||||
|
||||
|
||||
try {
|
||||
const res = await fetch(`/api/user/form`, {
|
||||
method: 'PUT',
|
||||
const res = await fetch(`/api/user/form`, {
|
||||
method: 'PUT',
|
||||
// headers:{
|
||||
|
||||
|
||||
// }
|
||||
body: JSON.stringify(payload)
|
||||
body: JSON.stringify(payload)
|
||||
});
|
||||
|
||||
if (res.ok) {
|
||||
showToast({ message: 'Анкета сохранена!', duration: 2500 });
|
||||
showToast({message: 'Анкета сохранена!', duration:2500});
|
||||
{% if notify %}
|
||||
const targetHash = window.location.hash;
|
||||
if (targetHash) {
|
||||
const el = document.querySelector(targetHash);
|
||||
if (el) {
|
||||
el.scrollIntoView({ behavior: 'smooth' });
|
||||
}
|
||||
}
|
||||
window.location.reload();
|
||||
const targetHash = window.location.hash;
|
||||
if (targetHash) {
|
||||
const el = document.querySelector(targetHash);
|
||||
if (el) {
|
||||
el.scrollIntoView({ behavior: 'smooth' });
|
||||
}
|
||||
}
|
||||
window.location.reload();
|
||||
{% endif %}
|
||||
} else {
|
||||
showToast({ message: 'Ошибка при сохранение!', status: 'error', duration: 2500 });
|
||||
showToast({message: 'Ошибка при сохранение!', status: 'error', duration:2500});
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
showToast({ message: 'Ошибка соединения с сервером!', status: 'error', duration: 2500 });
|
||||
showToast({message: 'Ошибка соединения с сервером!', status: 'error', duration:2500});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
// @license-end
|
||||
|
||||
|
||||
// @license-end
|
||||
</script>
|
||||
{{ footer.section(user) }}
|
||||
{% endblock %}
|
||||
|
||||
@ -12,21 +12,21 @@
|
||||
<figure class="c_4b1hy b_uu2ub" data-exhibition_id="{{doc.get('exhibition_id')}}" data-delivery-id="{{doc._id}}" data-sender="{{doc.sender._id}}" data-receiver="{{doc.receiver._id}}">
|
||||
<img class="b_1fvkt" src="/b/posts/{{doc.img}}">
|
||||
<figcaption class="c_3g8gh b_pvw5a" data-id="{{doc._id}}">
|
||||
{% if (doc.status or '') == 'Ожидает отправки' %}
|
||||
{% if doc.status == 'Ожидает отправки' %}
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{(doc.status or '')}}</span>
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
{% elif 'Получено' in (doc.status or '') %}
|
||||
{% elif doc.status == 'Получено' %}
|
||||
<div class="b_thlt1">
|
||||
<span class="b_5dr47">{{(doc.status or '')}}</span>
|
||||
<span class="b_5dr47">{{doc.status}}</span>
|
||||
</div>
|
||||
{% elif (doc.status or '') == 'Ожидает получения' %}
|
||||
{% elif doc.status == 'Ожидает получения' %}
|
||||
<div class="b_thlt1_2">
|
||||
<span class="b_5dr47_2">{{(doc.status or '')}}</span>
|
||||
<span class="b_5dr47_2">{{doc.status}}</span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="b_thlt1_2">
|
||||
<span class="b_5dr47_2">{{(doc.status or '')}}</span>
|
||||
<span class="b_5dr47_2">{{doc.status}}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
<a class="b_6spaf" href="/profile/delivery/{{doc.post_id}}#main">Посмотреть историю</a>
|
||||
@ -790,7 +790,7 @@ picture > img {
|
||||
}
|
||||
.b_kbsvf {
|
||||
padding: 10px 20px;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
align-self: stretch;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -173,7 +173,7 @@ picture > img {
|
||||
}
|
||||
.b_kbsvf {
|
||||
padding: 10px 20px;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
align-self: stretch;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -75,7 +75,7 @@ picture>img{ width: 100%; object-fit: scale-down; }
|
||||
.b_rhbo8 { color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.b_tbfd3 { color: rgba(58, 58, 58, 0.75); font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; text-align: right; }
|
||||
.b_gagrr { align-items: center; align-self: stretch; display: flex; justify-content: space-between; }
|
||||
.b_kbsvf { align-items: center; align-self: stretch; display: flex; flex-direction: column; gap: 10px; justify-content: center; }
|
||||
.b_kbsvf { align-items: flex-start; align-self: stretch; display: flex; flex-direction: column; gap: 10px; justify-content: center; }
|
||||
.b_h57rq { align-items: flex-start; background: #FDFAFF; border-radius: 5px; border: 1px solid #5F1798; box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.25), 0 4px 20px 0 rgba(0, 0, 0, 0.20); display: flex; flex-direction: column; width: 335px; }
|
||||
.c_jy9j2{padding: 10px 20px; height: 226px;}
|
||||
/* Mobile */
|
||||
|
||||
@ -148,7 +148,7 @@
|
||||
<div class="b_1fvkt">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}"
|
||||
class="b_1fvkt" src="/b/posts/{{ post.medias_original[0] }}/500/90/80"
|
||||
class="b_1fvkt" src="/b/posts/{{ post.medias[0] }}"
|
||||
data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
@ -206,8 +206,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
document.querySelectorAll('.c_6cezu.b_6spaf').forEach(toggle => {
|
||||
toggle.addEventListener('click', () => {
|
||||
const parent = toggle.parentElement; // ваш parent
|
||||
|
||||
@ -176,7 +176,7 @@ failBtn.addEventListener('click', () => selectMember('fail'));
|
||||
<div class="b_1fvkt">
|
||||
<picture>
|
||||
<img crossorigin="anonymous" fetchpriority="high" loading="eager" alt="{{ post.title }}" class="b_1fvkt"
|
||||
src="/b/posts/{{ post.medias_original[0] }}/500/90/80" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
src="/b/posts/{{ post.medias[0] }}" data-src="/b/posts/{{ post.medias_original[0] }}">
|
||||
</picture>
|
||||
</div>
|
||||
<figcaption class="c_3g8gh b_pvw5a">
|
||||
@ -208,8 +208,7 @@ failBtn.addEventListener('click', () => selectMember('fail'));
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
document.querySelectorAll('.c_6cezu.b_6spaf').forEach(toggle => {
|
||||
toggle.addEventListener('click', () => {
|
||||
const parent = toggle.parentElement; // ваш parent
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
{% import "competition/list.html" as competition %}
|
||||
{% import "components/label.html" as label %}
|
||||
|
||||
{% block title %}Каталог картин | Выставка {{exhibition.title}}{% endblock %}
|
||||
{% block title %}Каталог картин{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{{ header.section(user) }}
|
||||
@ -17,7 +17,7 @@
|
||||
{{ profile_nav.profile_nav(user, 'exhibitions') }}
|
||||
<div class="c_3ihvi" id="main">
|
||||
<a class="c_ctfod b_289i1 ba" href="/profile/partner/exhibition/{{exhibition._id}}#main">
|
||||
<span class="c_d2l0b b_al8e7">Отобранные картины (<span id="lenPosts2">{{ exhibition.posts | length }}</span>)</span>
|
||||
<span class="c_d2l0b b_al8e7">Отобранные картины</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="c_tihtk">
|
||||
@ -88,8 +88,7 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
const galerists = [
|
||||
{% for p in galerists %}
|
||||
{
|
||||
@ -101,8 +100,7 @@
|
||||
document.getElementById('filter-galerists').dataset.list=JSON.stringify(galerists)
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script defer>
|
||||
const living_places = [
|
||||
{% for p in living_places %}
|
||||
{
|
||||
@ -114,8 +112,7 @@ document.getElementById('filter-galerists').dataset.list=JSON.stringify(galerist
|
||||
document.getElementById('filter-city').dataset.list=JSON.stringify(living_places)
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
<script async>
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const genres_count = {{genres|tojson}};
|
||||
let genres = [
|
||||
@ -476,8 +473,6 @@ genre = genres.map(g => {
|
||||
// Обновляем счётчик
|
||||
const lenEl = document.getElementById('lenPosts');
|
||||
if (lenEl) lenEl.textContent = exhibition.posts.length;
|
||||
const lenEl2 = document.getElementById('lenPosts2');
|
||||
if (lenEl2) lenEl2.textContent = exhibition.posts.length;
|
||||
|
||||
} else {
|
||||
el.checked = !isAdding;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
{% import "components/label.html" as label %}
|
||||
{% import "/components/contacts.html" as contacts %}
|
||||
|
||||
{% block title %}Отправить приглашения | Выставка {{exhibition.title}}{% endblock %}
|
||||
{% block title %}Отобранные картины | Выставка {{exhibition.title}}{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
@ -16,386 +16,40 @@
|
||||
<div class="c_ru432">
|
||||
{{ profile_nav.profile_nav(user, 'password') }}
|
||||
<div class="c_tihtk" id="main">
|
||||
<section class="c_sbrxk">
|
||||
<div class="c_dtjoh">
|
||||
<h2 style="text-align: center; margin-bottom: 24px; color: #5F1798;">Придумайте новый пароль</h2>
|
||||
|
||||
<div class="c_aihm6 floating-group">
|
||||
<input type="password" id="new_password" class="c_xhd5k" required minlength="6">
|
||||
<label for="new_password" class="c_z3ybu floating-label">Новый пароль</label>
|
||||
<div type="button" class="password-toggle" aria-label="Toggle password visibility">
|
||||
<svg class="eye eye-open" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.1875 14.6875C16.0625 13.8125 16.5 12.75 16.5 11.5C16.5 10.25 16.0625 9.1875 15.1875 8.3125C14.3125 7.4375 13.25 7 12 7C10.75 7 9.6875 7.4375 8.8125 8.3125C7.9375 9.1875 7.5 10.25 7.5 11.5C7.5 12.75 7.9375 13.8125 8.8125 14.6875C9.6875 15.5625 10.75 16 12 16C13.25 16 14.3125 15.5625 15.1875 14.6875ZM10.0875 13.4125C9.5625 12.8875 9.3 12.25 9.3 11.5C9.3 10.75 9.5625 10.1125 10.0875 9.5875C10.6125 9.0625 11.25 8.8 12 8.8C12.75 8.8 13.3875 9.0625 13.9125 9.5875C14.4375 10.1125 14.7 10.75 14.7 11.5C14.7 12.25 14.4375 12.8875 13.9125 13.4125C13.3875 13.9375 12.75 14.2 12 14.2C11.25 14.2 10.6125 13.9375 10.0875 13.4125ZM5.35 16.9625C3.35 15.6042 1.9 13.7833 1 11.5C1.9 9.21667 3.35 7.39583 5.35 6.0375C7.35 4.67917 9.56667 4 12 4C14.4333 4 16.65 4.67917 18.65 6.0375C20.65 7.39583 22.1 9.21667 23 11.5C22.1 13.7833 20.65 15.6042 18.65 16.9625C16.65 18.3208 14.4333 19 12 19C9.56667 19 7.35 18.3208 5.35 16.9625ZM17.1875 15.5125C18.7625 14.5208 19.9667 13.1833 20.8 11.5C19.9667 9.81667 18.7625 8.47917 17.1875 7.4875C15.6125 6.49583 13.8833 6 12 6C10.1167 6 8.3875 6.49583 6.8125 7.4875C5.2375 8.47917 4.03333 9.81667 3.2 11.5C4.03333 13.1833 5.2375 14.5208 6.8125 15.5125C8.3875 16.5042 10.1167 17 12 17C13.8833 17 15.6125 16.5042 17.1875 15.5125Z" fill="#5F1798"/>
|
||||
</svg>
|
||||
<svg class="eye eye-closed" style="display:none" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5F1798">
|
||||
<path d="m644-428-58-58q9-47-27-88t-93-32l-58-58q17-8 34.5-12t37.5-4q75 0 127.5 52.5T660-500q0 20-4 37.5T644-428Zm128 126-58-56q38-29 67.5-63.5T832-500q-50-101-143.5-160.5T480-720q-29 0-57 4t-55 12l-62-62q41-17 84-25.5t90-8.5q151 0 269 83.5T920-500q-23 59-60.5 109.5T772-302Zm20 246L624-222q-35 11-70.5 16.5T480-200q-151 0-269-83.5T40-500q21-53 53-98.5t73-81.5L56-792l56-56 736 736-56 56ZM222-624q-29 26-53 57t-41 67q50 101 143.5 160.5T480-280q20 0 39-2.5t39-5.5l-36-38q-11 3-21 4.5t-21 1.5q-75 0-127.5-52.5T300-500q0-11 1.5-21t4.5-21l-84-82Zm319 93Zm-151 75Z"/>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="c_aihm6 floating-group password-group" style="margin-bottom: 20px;">
|
||||
<input type="password" id="confirm_password" class="c_xhd5k" required minlength="6">
|
||||
<label for="confirm_password" class="c_z3ybu floating-label">Подтвердите пароль</label>
|
||||
<div type="button" class="password-toggle" aria-label="Toggle password visibility">
|
||||
<svg class="eye eye-open" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.1875 14.6875C16.0625 13.8125 16.5 12.75 16.5 11.5C16.5 10.25 16.0625 9.1875 15.1875 8.3125C14.3125 7.4375 13.25 7 12 7C10.75 7 9.6875 7.4375 8.8125 8.3125C7.9375 9.1875 7.5 10.25 7.5 11.5C7.5 12.75 7.9375 13.8125 8.8125 14.6875C9.6875 15.5625 10.75 16 12 16C13.25 16 14.3125 15.5625 15.1875 14.6875ZM10.0875 13.4125C9.5625 12.8875 9.3 12.25 9.3 11.5C9.3 10.75 9.5625 10.1125 10.0875 9.5875C10.6125 9.0625 11.25 8.8 12 8.8C12.75 8.8 13.3875 9.0625 13.9125 9.5875C14.4375 10.1125 14.7 10.75 14.7 11.5C14.7 12.25 14.4375 12.8875 13.9125 13.4125C13.3875 13.9375 12.75 14.2 12 14.2C11.25 14.2 10.6125 13.9375 10.0875 13.4125ZM5.35 16.9625C3.35 15.6042 1.9 13.7833 1 11.5C1.9 9.21667 3.35 7.39583 5.35 6.0375C7.35 4.67917 9.56667 4 12 4C14.4333 4 16.65 4.67917 18.65 6.0375C20.65 7.39583 22.1 9.21667 23 11.5C22.1 13.7833 20.65 15.6042 18.65 16.9625C16.65 18.3208 14.4333 19 12 19C9.56667 19 7.35 18.3208 5.35 16.9625ZM17.1875 15.5125C18.7625 14.5208 19.9667 13.1833 20.8 11.5C19.9667 9.81667 18.7625 8.47917 17.1875 7.4875C15.6125 6.49583 13.8833 6 12 6C10.1167 6 8.3875 6.49583 6.8125 7.4875C5.2375 8.47917 4.03333 9.81667 3.2 11.5C4.03333 13.1833 5.2375 14.5208 6.8125 15.5125C8.3875 16.5042 10.1167 17 12 17C13.8833 17 15.6125 16.5042 17.1875 15.5125Z" fill="#5F1798"/>
|
||||
</svg>
|
||||
<svg class="eye eye-closed" style="display:none" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5F1798">
|
||||
<path d="m644-428-58-58q9-47-27-88t-93-32l-58-58q17-8 34.5-12t37.5-4q75 0 127.5 52.5T660-500q0 20-4 37.5T644-428Zm128 126-58-56q38-29 67.5-63.5T832-500q-50-101-143.5-160.5T480-720q-29 0-57 4t-55 12l-62-62q41-17 84-25.5t90-8.5q151 0 269 83.5T920-500q-23 59-60.5 109.5T772-302Zm20 246L624-222q-35 11-70.5 16.5T480-200q-151 0-269-83.5T40-500q21-53 53-98.5t73-81.5L56-792l56-56 736 736-56 56ZM222-624q-29 26-53 57t-41 67q50 101 143.5 160.5T480-280q20 0 39-2.5t39-5.5l-36-38q-11 3-21 4.5t-21 1.5q-75 0-127.5-52.5T300-500q0-11 1.5-21t4.5-21l-84-82Zm319 93Zm-151 75Z"/>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button class="c_aq9et" id="resetBtn" style="margin-bottom: 16px;">
|
||||
<span class="c_som9s">Сменить пароль</span>
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
async function getSHA256Hash(message) {
|
||||
const encoder = new TextEncoder();
|
||||
const msgBuffer = encoder.encode(message);
|
||||
|
||||
const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer);
|
||||
|
||||
const hashArray = Array.from(new Uint8Array(hashBuffer));
|
||||
|
||||
const hashHex = hashArray
|
||||
.map(b => b.toString(16).padStart(2, '0'))
|
||||
.join('');
|
||||
|
||||
return hashHex;
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
// Password toggle functionality (same as login)
|
||||
document.querySelectorAll('.password-toggle').forEach(toggle => {
|
||||
const input = toggle.parentElement.querySelector('input');
|
||||
const eyeOpen = toggle.querySelector('.eye-open');
|
||||
const eyeClosed = toggle.querySelector('.eye-closed');
|
||||
|
||||
toggle.addEventListener('click', () => {
|
||||
if (input.type === 'password') {
|
||||
input.type = 'text';
|
||||
eyeOpen.style.display = 'none';
|
||||
eyeClosed.style.display = 'inline';
|
||||
} else {
|
||||
input.type = 'password';
|
||||
eyeOpen.style.display = 'inline';
|
||||
eyeClosed.style.display = 'none';
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Form submit
|
||||
document.getElementById('resetBtn').addEventListener('click', async () => {
|
||||
const newPass = document.getElementById('new_password').value;
|
||||
const confirmPass = document.getElementById('confirm_password').value;
|
||||
|
||||
if (newPass.length < 6) {
|
||||
showToast({ message: "Пароль должен быть не менее 6 символов", status: 'error' });
|
||||
return;
|
||||
}
|
||||
|
||||
if (newPass !== confirmPass) {
|
||||
showToast({ message: "Пароли не совпадают", status: 'error' });
|
||||
return;
|
||||
}
|
||||
const hash = await getSHA256Hash(newPass);
|
||||
try {
|
||||
const res = await fetch('/api/reset-hash-password', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
new_password: hash,
|
||||
token: 'access_token'
|
||||
})
|
||||
});
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
if (res.ok) {
|
||||
showToast({ message: "Пароль успешно изменён!", status: 'success' });
|
||||
setTimeout(() => {
|
||||
window.location.href = `/login?next=${data.next}`;
|
||||
}, 1500);
|
||||
} else {
|
||||
showToast({ message: data.detail || "Ошибка при смене пароля", status: 'error' });
|
||||
}
|
||||
} catch (err) {
|
||||
showToast({ message: "Ошибка соединения с сервером", status: 'error' });
|
||||
}
|
||||
});
|
||||
// @license-end
|
||||
</script>
|
||||
{{ footer.section(user) }}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block head %}
|
||||
{{ header.style() }}
|
||||
{{ profile_nav.style() }}
|
||||
<style>
|
||||
|
||||
/* Mobile */
|
||||
@media (max-width: 699px) {
|
||||
.c_mrl59 { align-items: center; background: #5F1798; border-radius: 25px; bottom: -15px; display: flex; height: 50px; justify-content: center; position: absolute; right: -15px; width: 50px; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* Tablet */
|
||||
@media (min-width: 700px) and (max-width: 900px) {
|
||||
.c_iiehk { align-items: center; border-radius: 5px; display: flex; flex-direction: column; gap: 20px; width: 335px; }
|
||||
.c_nnsh6>a>img{display: none;}
|
||||
|
||||
}
|
||||
|
||||
/* Desktop */
|
||||
@media (min-width: 901px) {
|
||||
.c_iiehk { align-items: flex-end; border-radius: 5px; display: flex; flex-direction: column; gap: 20px; width: 310px; }
|
||||
.c_nnsh6>a>img{display: none;}
|
||||
|
||||
}</style>
|
||||
<style>
|
||||
.poster-group {position: relative;}
|
||||
.password-group { position: relative; }
|
||||
a{color: #5F1798;}
|
||||
.password-toggle {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
padding: 0 10px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* remove default button outline but keep focus visible */
|
||||
.password-toggle:focus { outline: 2px solid rgba(95,23,152,0.25); outline-offset: 2px; }
|
||||
|
||||
/* ensure svg size fits */
|
||||
.password-toggle .eye { width: 24px; height: 24px; display: block; }
|
||||
|
||||
.file-name-display {width: 100%;padding: 16px 50px 16px 16px;border: 2px solid #ddd;border-radius: 8px;font-size: 16px;color: #555;background: #fff;min-height: 56px;display: flex;align-items: center;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;transition: all 0.3s ease;cursor: pointer;}
|
||||
|
||||
/* Hover эффект */
|
||||
.c_aihm6:hover input, .c_nb6gy:hover textarea, .poster-group:hover .file-name-display {border-color: #5F1798;}
|
||||
|
||||
/* Когда файл выбран — делаем текст чуть темнее */
|
||||
.poster-group.has-file .file-name-display {color: #222;font-weight: 500;}
|
||||
|
||||
/* Скрытый input file */
|
||||
.hidden-file {position: absolute;inset: 0;opacity: 0;cursor: pointer;z-index: 2;}
|
||||
|
||||
/* Плавающий лейбл */
|
||||
.poster-group .floating-label {position: absolute;left: 16px;top: 16px;font-size: 16px;color: #666;background: #fff;padding: 0 6px;z-index: 3;transition: all 0.3s ease;pointer-events: none;}
|
||||
|
||||
/* Когда лейбл должен подняться */
|
||||
.poster-group input:focus + .floating-label,
|
||||
.poster-group.has-file .floating-label {top: -8px;font-size: 13px;color: #5F1798;}
|
||||
|
||||
/* Иконка справа */
|
||||
.file-icon {position: absolute;right: 16px;top: 50%;transform: translateY(-50%);z-index: 3;pointer-events: none;}
|
||||
|
||||
/* Красная ошибка */
|
||||
.poster-group.error .file-name-display {border-color: #e74c3c !important;box-shadow: 0 0 0 3px rgba(231, 76, 60, 0.15);}
|
||||
|
||||
.poster-group.error .floating-label {color: #e74c3c !important;}
|
||||
/* ====================== FLOATING LABELS ====================== */
|
||||
.floating-group {position: relative;margin-bottom: 1.5rem;}
|
||||
|
||||
.floating-label {position: absolute;left: 16px;top: 16px;font-size: 16px;color: #666;transition: all 0.3s ease;pointer-events: none;background: #fff;padding: 0 6px;z-index: 2;}
|
||||
|
||||
/* Плавающий лейбл */
|
||||
.floating-group input:focus + .floating-label, .floating-group textarea:focus + .floating-label,
|
||||
.floating-group input:not(:placeholder-shown) + .floating-label, .floating-group textarea:not(:placeholder-shown) + .floating-label {top: -8px;font-size: 15px;color: #5F1798;}
|
||||
|
||||
/* Красная подсветка — ТОЛЬКО после попытки отправки */
|
||||
.floating-group.error input, .floating-group.error textarea,
|
||||
.floating-group.error input[type="file"] {border-color: #e74c3c !important;box-shadow: 0 0 0 3px rgba(231, 76, 60, 0.38);}
|
||||
|
||||
.floating-group.error .floating-label {color: #e74c3c !important;}
|
||||
|
||||
/* Основные стили полей */
|
||||
.c_xhd5k, .c_4ykpn {width: 100%;padding: 16px 16px;border: 2px solid #ddd;border-radius: 8px;font-size: 16px;transition: all 0.3s ease;background: #fff;}
|
||||
|
||||
.c_xhd5k:focus, .c_4ykpn:focus {border-color: #5F1798;outline: none;box-shadow: 0 0 0 3px rgba(95, 23, 152, 0.15);}
|
||||
|
||||
/* Файловые поля */
|
||||
.file-group input[type="file"] {height: 43px;}
|
||||
|
||||
|
||||
.file-group .floating-label {top: 12px;}
|
||||
/* ====================== СКРЫТЬ СТРЕЛОЧКИ У INPUT TYPE=NUMBER ====================== */
|
||||
|
||||
/* Chrome, Edge, Safari, Opera */
|
||||
input[type="number"]::-webkit-outer-spin-button,
|
||||
input[type="number"]::-webkit-inner-spin-button {-webkit-appearance: none;margin: 0;display: none;}
|
||||
|
||||
/* Firefox */
|
||||
input[type="number"] {-moz-appearance: textfield;}
|
||||
|
||||
/* Дополнительно: чтобы стрелочки не появлялись при фокусе (на всякий случай) */
|
||||
input[type="number"]:hover::-webkit-outer-spin-button,
|
||||
input[type="number"]:focus::-webkit-outer-spin-button,
|
||||
input[type="number"]:hover::-webkit-inner-spin-button,
|
||||
input[type="number"]:focus::-webkit-inner-spin-button {display: none;}
|
||||
.c_xc07u {white-space: pre;}
|
||||
.c_5qh93{cursor: pointer;}
|
||||
.c_965ia{object-fit: cover;}
|
||||
@media (min-width: 901px) {
|
||||
.c_abq53 { color: #0ED646; font-family: Inter; font-size: 12px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_ydot9 { display: flex; padding: 1.5px 10px; justify-content: center; align-items: center; border-radius: 30px; background: rgba(14, 214, 70, 0.20); }
|
||||
.c_w5koo { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; flex: 1 0 0; overflow: hidden; color: #000; text-overflow: ellipsis; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_fudgr { display: flex; justify-content: center; align-items: center; align-self: stretch; }
|
||||
.c_n5lj4 { align-self: stretch; color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_bffhf { width: 50px; height: 50px; aspect-ratio: 1/1; border-radius: 50px; }
|
||||
.c_sya8w { align-self: stretch; color: #000; font-family: Inter; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_o5cc2 { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; flex: 1 0 0; }
|
||||
.c_zxyme { display: flex; height: 50px; align-items: center; gap: 13px; align-self: stretch; }
|
||||
.c_rq5iq { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; align-self: stretch; overflow: hidden; color: rgba(58, 58, 58, 0.75); text-overflow: ellipsis; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_sa311 { align-self: stretch; color: rgba(58, 58, 58, 0.75); text-align: right; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_yhst8 { display: flex; padding: 10px 20px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 10px; align-self: stretch; border-radius: 10px; background: #FFF; }
|
||||
.c_jz1u6 { display: flex; width: 335px; height: 418px; padding: 120px 20px 20px 20px; flex-direction: column; align-items: flex-start; border-radius: 5px; border: 1px solid #5F1798; box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.30), 0 4px 20px 0 rgba(0, 0, 0, 0.20); }
|
||||
}
|
||||
|
||||
@media (min-width: 700px) and (max-width: 900px) {
|
||||
.c_abq53 { color: #0ED646; font-family: Inter; font-size: 12px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_ydot9 { display: flex; padding: 1.5px 10px; justify-content: center; align-items: center; border-radius: 30px; background: rgba(14, 214, 70, 0.20); }
|
||||
.c_w5koo { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; flex: 1 0 0; overflow: hidden; color: #000; text-overflow: ellipsis; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_fudgr { display: flex; justify-content: center; align-items: center; align-self: stretch; }
|
||||
.c_n5lj4 { align-self: stretch; color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_bffhf { width: 50px; height: 50px; aspect-ratio: 1/1; border-radius: 50px; }
|
||||
.c_sya8w { align-self: stretch; color: #000; font-family: Inter; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_o5cc2 { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; flex: 1 0 0; }
|
||||
.c_zxyme { display: flex; height: 50px; align-items: center; gap: 13px; align-self: stretch; }
|
||||
.c_rq5iq { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; align-self: stretch; overflow: hidden; color: rgba(58, 58, 58, 0.75); text-overflow: ellipsis; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_sa311 { align-self: stretch; color: rgba(58, 58, 58, 0.75); text-align: right; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_yhst8 { display: flex; padding: 10px 20px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 10px; align-self: stretch; border-radius: 10px; background: #FFF; }
|
||||
.c_jz1u6 { display: flex; width: calc(50% - 10px); height: 418px; padding: 120px 20px 20px 20px; flex-direction: column; align-items: flex-start; flex-shrink: 0; border-radius: 5px; border: 1px solid #5F1798; box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.30), 0 4px 20px 0 rgba(0, 0, 0, 0.20); }
|
||||
}
|
||||
|
||||
@media (max-width: 699px) {
|
||||
.c_abq53 { color: #0ED646; font-family: Inter; font-size: 12px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_ydot9 { display: flex; padding: 1.5px 10px; justify-content: center; align-items: center; border-radius: 30px; background: rgba(14, 214, 70, 0.20); }
|
||||
.c_w5koo { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; flex: 1 0 0; overflow: hidden; color: #000; text-overflow: ellipsis; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_fudgr { display: flex; justify-content: center; align-items: center; align-self: stretch; }
|
||||
.c_n5lj4 { align-self: stretch; color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_bffhf { width: 50px; height: 50px; aspect-ratio: 1/1; border-radius: 50px; }
|
||||
.c_sya8w { align-self: stretch; color: #000; font-family: Inter; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_o5cc2 { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; flex: 1 0 0; }
|
||||
.c_zxyme { display: flex; height: 50px; align-items: center; gap: 13px; align-self: stretch; }
|
||||
.c_rq5iq { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; align-self: stretch; overflow: hidden; color: rgba(58, 58, 58, 0.75); text-overflow: ellipsis; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_sa311 { align-self: stretch; color: rgba(58, 58, 58, 0.75); text-align: right; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_yhst8 { display: flex; padding: 10px 20px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 10px; align-self: stretch; border-radius: 10px; background: #FFF; }
|
||||
.c_jz1u6 { display: flex; width: 335px; padding: 120px 20px 20px 20px; flex-direction: column; align-items: flex-start; border-radius: 5px; border: 1px solid #5F1798; box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.30), 0 4px 20px 0 rgba(0, 0, 0, 0.20); }
|
||||
}
|
||||
@media (min-width: 901px) {
|
||||
.c_xhd5k { display: flex; height: 42px; padding: 5px 10px; align-items: center; flex: 1 0 0; }
|
||||
.c_z3ybu { position: absolute; left: 13px; top: 12px; color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_vphtp { width: 18px; height: 18px; fill: #5F1798; }
|
||||
.c_ffjwp { width: 24px; height: 24px; flex-shrink: 0; }
|
||||
.c_aihm6 { display: flex; width: 323px; justify-content: center; align-items: center; border-radius: 5px; background: #FFF; }
|
||||
.c_4ykpn { display: flex; height: 104px; padding: 10px 10px; align-items: center; flex: 1 0 0; }
|
||||
.c_nb6gy { display: flex; width: 323px; justify-content: center; align-items: center; border-radius: 5px; background: #FFF; }
|
||||
.c_q00x6 { min-width: 230px; flex: 1 0 0; color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_mkcow { color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_uklyi { width: 20px; color: #000; text-align: center; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_l8kil {display: flex;padding: 5px 00px;align-items: center;border-radius: 5px;border: 1px solid rgba(95, 23, 152, 0.20);background: #FDFAFF;width: 35px;text-align: center;}
|
||||
.c_5qh93 { display: flex; height: 7px; justify-content: center; align-items: center; flex: 1 0 0; border-radius: 5px; background: rgba(95, 23, 152, 0.20); }
|
||||
.c_jups4 { display: flex; width: 323px; padding: 10px; align-items: center; align-content: center; gap: 10px; flex-wrap: wrap; border-radius: 5px; background: #FFF; border: 1px solid #5F1798; }
|
||||
.c_som9s { color: #FFF; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_aq9et { display: flex; padding: 19px 33px; justify-content: center; align-items: center; align-self: stretch; border-radius: 5px; background: #5F1798; }
|
||||
.c_dtjoh { display: flex; width: 323px; flex-direction: column; align-items: flex-start; gap: 12px; flex-shrink: 0; }
|
||||
.c_1gai0 { align-self: stretch; color: #000; text-align: center; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_med8n { color: #5F1798; font-family: Inter; font-size: 12px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_g8o3y { display: flex; padding: 1.5px 10px; justify-content: center; align-items: center; border-radius: 30px; background: rgba(95, 23, 152, 0.20); }
|
||||
.c_1pdx0 { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; flex: 1 0 0; overflow: hidden; color: #000; text-overflow: ellipsis; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_r5tzr { display: flex; justify-content: center; align-items: center; align-self: stretch; }
|
||||
.c_965ia { width: 50px; height: 50px; aspect-ratio: 1/1; border-radius: 50px; }
|
||||
.c_t9q2z { width: 189px; color: #000; font-family: Inter; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_zruk7 { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; }
|
||||
.c_k3nyf { display: flex; height: 50px; align-items: center; gap: 13px; align-self: stretch; }
|
||||
.c_xc07u { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; align-self: stretch; overflow: hidden; color: rgba(58, 58, 58, 0.75); text-overflow: ellipsis; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_hni7n { align-self: stretch; color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_qfcvm { align-self: stretch; color: rgba(58, 58, 58, 0.75); text-align: right; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_rtopc { display: flex; width: 355px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 20px; flex-shrink: 0; }
|
||||
.c_sbrxk { padding: 50px 0px 100px; display: flex; box-sizing: unset; justify-content: center; align-items: flex-start; align-content: flex-start; gap: 200px; flex-wrap: wrap; background: #FFF; }
|
||||
}
|
||||
|
||||
@media (min-width: 700px) and (max-width: 900px) {
|
||||
.c_xhd5k { display: flex; height: 42px; padding: 5px 10px; align-items: center; flex: 1 0 0; }
|
||||
.c_z3ybu { position: absolute; left: 13px; top: 12px; color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_vphtp { width: 18px; height: 18px; fill: #5F1798; }
|
||||
.c_ffjwp { width: 24px; height: 24px; flex-shrink: 0; }
|
||||
.c_aihm6 { display: flex; width: 323px; justify-content: center; align-items: center; border-radius: 5px; background: #FFF; }
|
||||
.c_4ykpn { display: flex; height: 104px; padding: 10px 10px; align-items: center; flex: 1 0 0; }
|
||||
.c_nb6gy { display: flex; width: 323px; justify-content: center; align-items: center; border-radius: 5px; background: #FFF; }
|
||||
.c_q00x6 { min-width: 230px; flex: 1 0 0; color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_mkcow { color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_uklyi { width: 20px; color: #000; text-align: center; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_l8kil {display: flex;padding: 5px 00px;align-items: center;border-radius: 5px;border: 1px solid rgba(95, 23, 152, 0.20);background: #FDFAFF;width: 35px;text-align: center;}
|
||||
.c_5qh93 { display: flex; height: 7px; justify-content: center; align-items: center; flex: 1 0 0; border-radius: 5px; background: rgba(95, 23, 152, 0.20); }
|
||||
.c_jups4 { display: flex; width: 323px; padding: 10px; align-items: center; align-content: center; gap: 10px; flex-wrap: wrap; border-radius: 5px; background: #FFF; border: 1px solid #5F1798; }
|
||||
.c_som9s { color: #FFF; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_aq9et { display: flex; padding: 19px 33px; justify-content: center; align-items: center; align-self: stretch; border-radius: 5px; background: #5F1798; }
|
||||
.c_dtjoh { display: flex; width: 323px; flex-direction: column; align-items: flex-start; gap: 12px; flex-shrink: 0; }
|
||||
.c_1gai0 { align-self: stretch; color: #000; text-align: center; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_med8n { color: #5F1798; font-family: Inter; font-size: 12px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_g8o3y { display: flex; padding: 1.5px 10px; justify-content: center; align-items: center; border-radius: 30px; background: rgba(95, 23, 152, 0.20); }
|
||||
.c_1pdx0 { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; flex: 1 0 0; overflow: hidden; color: #000; text-overflow: ellipsis; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_r5tzr { display: flex; justify-content: center; align-items: center; align-self: stretch; }
|
||||
.c_965ia { width: 50px; height: 50px; aspect-ratio: 1/1; border-radius: 50px; }
|
||||
.c_t9q2z { width: 189px; color: #000; font-family: Inter; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_zruk7 { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; }
|
||||
.c_k3nyf { display: flex; height: 50px; align-items: center; gap: 13px; align-self: stretch; }
|
||||
.c_xc07u { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; align-self: stretch; overflow: hidden; color: rgba(58, 58, 58, 0.75); text-overflow: ellipsis; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_hni7n { align-self: stretch; color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_qfcvm { align-self: stretch; color: rgba(58, 58, 58, 0.75); text-align: right; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_rtopc { display: flex; width: 355px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 20px; flex-shrink: 0; }
|
||||
.c_sbrxk { padding: 50px 0px 100px; display: flex; box-sizing: unset; justify-content: center; align-items: flex-start; gap: 50px; background: #FFF; }
|
||||
}
|
||||
|
||||
@media (max-width: 699px) {
|
||||
.c_xhd5k { display: flex; height: 42px; padding: 5px 10px; align-items: center; flex: 1 0 0; }
|
||||
.c_z3ybu { position: absolute; left: 13px; top: 12px; color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_vphtp { width: 18px; height: 18px; fill: #5F1798; }
|
||||
.c_ffjwp { width: 24px; height: 24px; }
|
||||
.c_aihm6 { display: flex; justify-content: center; align-items: center; align-self: stretch; border-radius: 5px; background: #FFF; }
|
||||
.c_4ykpn { display: flex; height: 104px; padding: 10px 10px; align-items: center; flex: 1 0 0; }
|
||||
.c_nb6gy { display: flex; justify-content: center; align-items: center; align-self: stretch; border-radius: 5px; background: #FFF; }
|
||||
.c_q00x6 { min-width: 230px; flex: 1 0 0; color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_mkcow { color: #000; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_uklyi { width: 20px; color: #000; text-align: center; font-family: Inter; font-size: 15px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_l8kil {display: flex;padding: 5px 00px;align-items: center;border-radius: 5px;border: 1px solid rgba(95, 23, 152, 0.20);background: #FDFAFF;width: 35px;text-align: center;}
|
||||
.c_5qh93 { height: 7px; flex: 1 0 0; fill: rgba(95, 23, 152, 0.20); background: rgba(95, 23, 152, 0.20);}
|
||||
.c_jups4 { display: flex; padding: 10px; align-items: center; align-content: center; gap: 10px; align-self: stretch; flex-wrap: wrap; border-radius: 5px; background: #FFF; border: 1px solid #5F1798; }
|
||||
.c_som9s { color: #FFF; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_aq9et { display: flex; padding: 19px 33px; justify-content: center; align-items: center; align-self: stretch; border-radius: 5px; background: #5F1798; }
|
||||
.c_dtjoh { display: flex; width: 323px; flex-direction: column; align-items: flex-start; gap: 12px; flex-shrink: 0; }
|
||||
.c_1gai0 { align-self: stretch; color: #000; text-align: center; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_med8n { color: #5F1798; font-family: Inter; font-size: 12px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_g8o3y { display: flex; padding: 1.5px 10px; justify-content: center; align-items: center; border-radius: 30px; background: rgba(95, 23, 152, 0.20); }
|
||||
.c_1pdx0 { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; flex: 1 0 0; overflow: hidden; color: #000; text-overflow: ellipsis; font-family: Inter; font-size: 24px; font-style: normal; font-weight: 700; line-height: normal; }
|
||||
.c_r5tzr { display: flex; justify-content: center; align-items: center; align-self: stretch; }
|
||||
.c_965ia { width: 50px; height: 50px; aspect-ratio: 1/1; border-radius: 50px; }
|
||||
.c_t9q2z { width: 189px; color: #000; font-family: Inter; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_zruk7 { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; }
|
||||
.c_k3nyf { display: flex; height: 50px; align-items: center; gap: 13px; align-self: stretch; }
|
||||
.c_xc07u { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; align-self: stretch; overflow: hidden; color: rgba(58, 58, 58, 0.75); text-overflow: ellipsis; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_hni7n { align-self: stretch; color: #5F1798; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_qfcvm { align-self: stretch; color: rgba(58, 58, 58, 0.75); text-align: right; font-family: Inter; font-size: 14px; font-style: normal; font-weight: 400; line-height: normal; }
|
||||
.c_rtopc { display: flex; width: 335px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 20px; flex-shrink: 0; }
|
||||
.c_sbrxk { padding: 50px 0px 100px; display: flex; box-sizing: unset; justify-content: center; align-items: flex-start; align-content: flex-start; gap: 50px 0; flex-wrap: wrap; background: #FFF; }
|
||||
}
|
||||
.c_sbrxk{z-index: 1000;}
|
||||
#preview_poster{width: 335px;}
|
||||
</style>
|
||||
{{ footer.style() }}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
@ -143,24 +143,6 @@ document.addEventListener("DOMContentLoaded",()=>{let e=document.querySelector("
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
async function getSHA256Hash(message) {
|
||||
const encoder = new TextEncoder();
|
||||
const msgBuffer = encoder.encode(message);
|
||||
|
||||
const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer);
|
||||
|
||||
const hashArray = Array.from(new Uint8Array(hashBuffer));
|
||||
|
||||
const hashHex = hashArray
|
||||
.map(b => b.toString(16).padStart(2, '0'))
|
||||
.join('');
|
||||
|
||||
return hashHex;
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
function showOfferModal(offerHtml = '<p>Текст оферты...</p>') {
|
||||
return new Promise((resolve) => {
|
||||
const backdrop = document.createElement('div');
|
||||
@ -302,12 +284,11 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
|
||||
// No client-side validation errors — send request
|
||||
try {
|
||||
const hash = await getSHA256Hash(document.getElementById('password').value);
|
||||
const formData = new FormData();
|
||||
formData.append('img', document.getElementById('avatar').files[0]);
|
||||
formData.append('living_place', document.getElementById('living_place').value);
|
||||
formData.append('Female_Name_Lastame', document.getElementById('fio').value);
|
||||
formData.append('password', hash);
|
||||
formData.append('password', document.getElementById('password').value);
|
||||
formData.append('email', document.getElementById('email').value);
|
||||
formData.append('phone', document.getElementById('phone').value);
|
||||
|
||||
|
||||
@ -49,24 +49,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
async function getSHA256Hash(message) {
|
||||
const encoder = new TextEncoder();
|
||||
const msgBuffer = encoder.encode(message);
|
||||
|
||||
const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer);
|
||||
|
||||
const hashArray = Array.from(new Uint8Array(hashBuffer));
|
||||
|
||||
const hashHex = hashArray
|
||||
.map(b => b.toString(16).padStart(2, '0'))
|
||||
.join('');
|
||||
|
||||
return hashHex;
|
||||
}
|
||||
// @license-end
|
||||
</script>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
// Password toggle functionality (same as login)
|
||||
@ -102,14 +85,14 @@ async function getSHA256Hash(message) {
|
||||
showToast({ message: "Пароли не совпадают", status: 'error' });
|
||||
return;
|
||||
}
|
||||
const hash = await getSHA256Hash(newPass);
|
||||
|
||||
try {
|
||||
const res = await fetch('/api/reset-password', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
token: "{{ token }}",
|
||||
new_password: hash
|
||||
new_password: newPass
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
{% import "/components/header.html" as header %}
|
||||
{% import "/components/footer.html" as footer %}
|
||||
{% import "posts/profile_card.html" as card %}
|
||||
{% import "/components/contacts.html" as contacts %}
|
||||
|
||||
|
||||
{% block title %}Посты{% endblock %}
|
||||
@ -15,6 +14,7 @@
|
||||
<div class="c_gtoe9">
|
||||
<div class="c_iiehk">
|
||||
<div class="c_8xkk0 b_2rmrs">
|
||||
|
||||
<div class="b_hjteq">
|
||||
<div class="b_zo7wz" for="avatar">
|
||||
<img class="b_rhmvx" src="/a/{{find._id}}" alt="{{find.username}}" id="preview" crossorigin="anonymous" fetchpriority="high" loading="eager">
|
||||
@ -22,35 +22,10 @@
|
||||
</div>
|
||||
<p class="c_kpaav b_xsvl1">{{find.username}}</p>
|
||||
{% if 'admin' in user.get('roles', []) %}
|
||||
<div class="c_ctfod b_289i1" id="switch-user">
|
||||
<button class="c_d2l0b b_al8e7">Переключиться на пользователя</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if 'admin' in user.get('roles', []) or 'partner' in user.get('roles', []) %}
|
||||
<!-- <div class="c_ctfod b_289i1"><span class="c_d2l0b b_al8e7">Написать пользователю</span></div> -->
|
||||
{{ contacts.details(find) }}
|
||||
{% endif %}
|
||||
<div >На платформе с {{ (find._id.generation_time.strftime('%Y')) if find._id else ''}}</div>
|
||||
{% if find.get('grade') is not none%}
|
||||
<p class="it o">Звание:</p>
|
||||
<p class="it">{{find.grade}}</p>
|
||||
{% endif %}
|
||||
{% if find.get('biography') is not none%}
|
||||
<p class="it o">Биография:</p>
|
||||
<p class="it">{{find.biography}}</p>
|
||||
{% endif %}
|
||||
<p>👁 {{total_watch_count}} (+{{today_watch_count}} Сегодня)</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="c_ru432">
|
||||
<div class="c_tihtk">
|
||||
{% for i in cards %}
|
||||
{{ card.section(i, loop.index, user) }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<div class="c_ctfod b_289i1" id="switch-user">
|
||||
<button class="c_d2l0b b_al8e7">Переключиться на пользователя</button>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
const userId = '{{find._id}}';
|
||||
@ -75,6 +50,33 @@ document.getElementById('switch-user').addEventListener('click', async () => {
|
||||
});
|
||||
// @license-end
|
||||
</script>
|
||||
{% endif %}
|
||||
{% if 'admin' in user.get('roles', []) %}
|
||||
<div class="c_ctfod b_289i1"><span class="c_d2l0b b_al8e7">Написать пользователю</span></div>
|
||||
{% endif %}
|
||||
<div >На платформе с {{ (find._id.generation_time.strftime('%Y')) if find._id else ''}}</div>
|
||||
{% if find.get('grade') is not none%}
|
||||
<p class="it o">Звание:</p>
|
||||
<p class="it">{{find.grade}}</p>
|
||||
{% endif %}
|
||||
{% if find.get('biography') is not none%}
|
||||
<p class="it o">Биография:</p>
|
||||
<p class="it">{{find.biography}}</p>
|
||||
{% endif %}
|
||||
<p>👁 {{total_watch_count}} (+{{today_watch_count}} Сегодня)</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="c_ru432">
|
||||
<div class="c_tihtk">
|
||||
{% for i in cards %}
|
||||
{{ card.section(i, loop.index, user) }}
|
||||
{% endfor %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<script>
|
||||
// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
@ -99,7 +101,6 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
{% block head %}
|
||||
{{ header.style() }}
|
||||
{{ card.style() }}
|
||||
{{ contacts.style() }}
|
||||
<style>
|
||||
.o{font-style: italic;color: #777;}
|
||||
.it{padding: 0px 15px;}
|
||||
|
||||
59
utils.py
59
utils.py
@ -352,72 +352,81 @@ def is_safe_redirect(next_url: str) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
async def build_composite(
|
||||
data: bytes,
|
||||
scale: float = 1.5,
|
||||
new_w: int = 500,
|
||||
quality: int = 90,
|
||||
GaussianBlur_radius: int = 80,
|
||||
) -> BytesIO:
|
||||
src_img = Image.open(BytesIO(data)).convert("RGB")
|
||||
async def build_composite(data, scale: float = 1.5, new_w: int = 500, quality: int = 90, GaussianBlur_radius: int = 80):
|
||||
src_img = Image.open(BytesIO(data)).convert('RGB')
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# 2️⃣ Параметры конечного результата
|
||||
# --------------------------------------------------------------
|
||||
new_h = int(new_w / scale) # высота для соотношения 3:2 (≈333)
|
||||
canvas_sz = (new_w, new_h)
|
||||
new_h = int(new_w / scale) # высота для соотношения 3:2 (≈333)
|
||||
canvas_sz = (new_w, new_h) # размер «фонового» холста
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# 3️⃣ Фоновое изображение – cover + blur(3)
|
||||
# --------------------------------------------------------------
|
||||
# - «cover» = заполняем весь холст, обрезая лишнее,
|
||||
# сохраняем пропорции оригинала.
|
||||
# - Затем делаем размытие радиусом 3.
|
||||
# --------------------------------------------------------------
|
||||
# Сначала масштабируем так, чтобы одна из сторон полностью покрывала холст
|
||||
src_ratio = src_img.width / src_img.height
|
||||
canvas_ratio = new_w / new_h
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# 3️⃣ Фоновое изображение – cover + blur (optional)
|
||||
# --------------------------------------------------------------
|
||||
if src_ratio > canvas_ratio:
|
||||
if src_ratio > canvas_ratio: # изображение более «широкое»
|
||||
# масштабируем по высоте, ширина будет больше холста → обрезаем по горизонтали
|
||||
scale_h = new_h
|
||||
scale_w = int(scale_h * src_ratio)
|
||||
else:
|
||||
else: # изображение более «высокое» или точное соотношение
|
||||
scale_w = new_w
|
||||
scale_h = int(scale_w / src_ratio)
|
||||
|
||||
# масштабируем
|
||||
bg_resized = src_img.resize((scale_w, scale_h), Image.LANCZOS)
|
||||
|
||||
# обрезаем центр, чтобы получить точно new_w × new_h
|
||||
left = (scale_w - new_w) // 2
|
||||
top = (scale_h - new_h) // 2
|
||||
right = left + new_w
|
||||
bottom = top + new_h
|
||||
bg_cropped = bg_resized.crop((left, top, right, bottom))
|
||||
|
||||
# размытие
|
||||
bg_blurred = bg_cropped.filter(ImageFilter.GaussianBlur(radius=GaussianBlur_radius))
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# 4️⃣ Переднее изображение – contain + центрировать
|
||||
# --------------------------------------------------------------
|
||||
# - «contain» = вписать изображение в границы canvas,
|
||||
# полностью показывая его, оставляя пустые поля (прозрачные)
|
||||
# --------------------------------------------------------------
|
||||
# Находим масштаб, чтобы изображение полностью поместилось
|
||||
if src_ratio > canvas_ratio:
|
||||
# ограничиваем ширину
|
||||
fore_w = new_w
|
||||
fore_h = int(fore_w / src_ratio)
|
||||
else:
|
||||
# ограничиваем высоту
|
||||
fore_h = new_h
|
||||
fore_w = int(fore_h * src_ratio)
|
||||
|
||||
fore_resized = src_img.resize((fore_w, fore_h), Image.LANCZOS)
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# 5️⃣ Сборка
|
||||
# --------------------------------------------------------------
|
||||
final_img = Image.new("RGB", canvas_sz, (255, 255, 255))
|
||||
# Создаём прозрачный холст того же размера, что и фон
|
||||
final_img = Image.new('RGB', canvas_sz, (0, 0, 0))
|
||||
|
||||
if GaussianBlur_radius:
|
||||
bg_blurred = bg_cropped.filter(ImageFilter.GaussianBlur(radius=GaussianBlur_radius))
|
||||
final_img.paste(bg_blurred, (0, 0))
|
||||
# else: оставляем чёрный фон (или можно вставить bg_cropped без blur)
|
||||
# Сначала помещаем размытый фон
|
||||
final_img.paste(bg_blurred, (0, 0))
|
||||
|
||||
# Затем — переднее изображение, центрированное
|
||||
offset_x = (new_w - fore_w) // 2
|
||||
offset_y = (new_h - fore_h) // 2
|
||||
final_img.paste(fore_resized, (offset_x, offset_y))
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# 6️⃣ Возврат
|
||||
# 5️⃣ Возврат / сохранение
|
||||
# --------------------------------------------------------------
|
||||
out_bytes = BytesIO()
|
||||
# final_img.save(out_bytes, format='JPEG', quality=85)
|
||||
final_img.save(out_bytes, format="WEBP", quality=quality, method=6)
|
||||
out_bytes.seek(0)
|
||||
return out_bytes
|
||||
return out_bytes # JPEG‑байты готового композитного изображения
|
||||
|
||||
Loading…
Reference in New Issue
Block a user