34 Commits

Author SHA1 Message Date
mguschin
854c912a88 Migrate web app from Python/FastAPI to Node.js/TypeScript
Replace the entire Python/FastAPI backend with a Node.js/TypeScript stack:
- Framework: Hono + @hono/node-server
- Templates: Nunjucks (.njk) replacing Jinja2 (.html)
- ORM: Drizzle ORM with mysql2 (same MariaDB schema, no migrations needed)
- Sessions: hono-sessions with CookieStore
- CSS: Pico CSS v2 replacing Bootstrap 5 (Bootstrap Icons CDN kept)
- Dev: tsx watch; Prod: tsc + node dist/index.js

Original Python app preserved in web-python/ as backup.
Updated Dockerfile.web and docker-compose.yml for Node.js deployment.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-17 19:33:32 +03:00
mguschin
db0c1cbed3 Release version 1.9.0
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 17:21:24 +03:00
mguschin
fd7d0022ea Add VK OAuth implicit flow and fix sync issues
- Replace manual community token entry with OAuth button that redirects
  to VK authorization and auto-saves token via /vk/callback
- Fix groups.get API call (was groups.getById) to correctly retrieve
  admin group id and name from user token response
- Fix price comparison: VK price.amount is in roubles, not kopecks
- Keep manual token input as fallback when VK_CLIENT_ID is not set

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 17:21:16 +03:00
mguschin
1bf82adbfc Add sync engine and wire it into the web app
- Add sync_engine.py: background asyncio loop syncing Evotor products to VK market
- Wire sync_loop into lifespan alongside health_check_loop
- Add SYNC_INTERVAL_SECONDS and VK_DEFAULT_PHOTO_PATH settings to config
- Mount default product image in docker-compose
- Add synced_at column to CachedProduct model + migration
- Show synced_at status in catalog products template
- Fix VK groups API response parsing (handle list vs dict)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 17:05:37 +03:00
mguschin
9a68c083e3 Update README with comprehensive project documentation
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 17:02:14 +03:00
mguschin
aaeaa4f658 Fix product page dropdown clipped by table-responsive overflow
Set overflow: visible on table-responsive and use data-bs-strategy="fixed"
so the filter dropdown renders outside the scroll container.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 15:57:43 +03:00
mguschin
aea28ead9c Fix VK connect_url to point to /vk instead of /vk/connect
/vk/connect no longer exists after switching to manual token entry.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 15:40:39 +03:00
mguschin
cde2069d74 Remove unused VK OAuth env vars (VK_CLIENT_ID/SECRET/SCOPES)
VK connection now uses manual community token entry, so OAuth credentials
are no longer needed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 15:35:53 +03:00
mguschin
debb2efb3d Replace VK OAuth with manual community token entry
Resolves #4 — VK OAuth flow caused "Security Error" because market sync
requires a community access token, not a personal user token. Replaced
OAuth with manual token input (same pattern as Evotor). Added
step-by-step instructions. Updated health checker to validate community
tokens via groups.getById instead of users.get.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 15:32:13 +03:00
mguschin
4d4d5b0118 Add Jivosite live chat widget support
Resolves #3 — widget is loaded on every page via base.html when
JIVOSITE_WIDGET_ID env var is set. Centralized Jinja2Templates instance
in web/templates_env.py with jivosite_widget_id as a global.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 14:11:25 +03:00
mguschin
00b74b8aa9 Simplify Evotor connect to manual token entry only
Resolves #2 — removes semi-automatic OAuth flow (Переподключить button,
/evotor/connect and /evotor/link routes) and makes manual token entry
the sole connect option. Adds step-by-step instructions with a direct
link to the app on Evotor marketplace (opens in new tab).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 13:01:12 +03:00
mguschin
577c5de200 Add background catalog cache refresh to health check loop
Resolves #1 — the health checker now refreshes catalog cache for all
online Evotor connections when cache is missing or older than
CATALOG_REFRESH_INTERVAL_SECONDS (default: 3600s).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-10 12:53:44 +03:00
mguschin
0926757b7a Fix dropdown clipping using fixed positioning strategy
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 18:17:25 +03:00
mguschin
13c32e9181 Fix dropdown clipping in product table using data-bs-boundary
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 18:16:33 +03:00
mguschin
6b9eb562ba Fix dropdown clipping in product table by allowing overflow
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 18:13:07 +03:00
mguschin
9558333c94 Handle 402 Payment Required from Evotor API gracefully
Return empty list for groups/products when Evotor returns 402,
instead of crashing the refresh with an unhandled HTTP error.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 18:04:13 +03:00
mguschin
40e7abd012 Fix typo and redirect connections/add to evotor page
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:39:31 +03:00
mguschin
3d7a456299 Add manual token entry for Evotor connection
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:35:17 +03:00
mguschin
5acf597944 Redirect to app page on Evotor market instead of generic market URL
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:33:00 +03:00
mguschin
3f4bbcbb0d Fix alter_column missing existing_type for MySQL
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:26:32 +03:00
mguschin
c8beeaf1b1 Fix migration to skip already-existing evotor_user_id column/indexes
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:25:36 +03:00
mguschin
5ee8419c7c Replace EVOTOR_CLIENT_ID/SECRET with EVOTOR_APP_ID/WEBHOOK_SECRET in config
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:23:50 +03:00
mguschin
e376c86fbe Switch Evotor integration to webhook-based token delivery flow
Replace OAuth 2.0 authorization code flow with Evotor's proprietary
webhook token delivery: POST /evotor/callback receives token server-to-server,
GET /evotor/link links it to the logged-in user's account.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-09 17:18:25 +03:00
mguschin
69e21a18c9 fix docker compose. 2026-03-09 16:47:35 +03:00
mguschin
90a2f7be1f fix docker compose. 2026-03-09 16:41:59 +03:00
mguschin
d4633a0f46 Update nginx conf. 2026-03-09 16:41:09 +03:00
mguschin
b72b0e78b0 Nginx upstream. 2026-03-09 16:23:59 +03:00
mguschin
2a04099f95 Fix tls script. 2026-03-09 16:11:03 +03:00
mguschin
58f9b74a1c Change default port. 2026-03-09 15:54:19 +03:00
mguschin
8c9c328302 chore(release): v1.8.2
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-06 18:41:43 +03:00
mguschin
784bb27958 chore: replace EvoSync with ЭВОСИНК throughout UI
Update all page titles and branding in FastAPI app and templates to use Russian transliteration of product name.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-03-06 18:40:11 +03:00
mguschin
1add9fa299 release: v1.8.1 2026-03-06 17:00:08 +03:00
mguschin
b8696793f4 docs: fix changelog order — 1.8.0 before 1.7.3 2026-03-06 16:59:32 +03:00
mguschin
37e2df1fef docs: update changelog for v1.7.3 2026-03-06 16:58:51 +03:00
111 changed files with 7275 additions and 591 deletions

View File

@@ -2,6 +2,9 @@ DATABASE_URL=mysql+pymysql://evosync:evosync@db:3306/evosync
SECRET_KEY=your-random-secret-key-here
BASE_URL=http://localhost:8000
EVOTOR_APP_ID=your-evotor-app-id
EVOTOR_WEBHOOK_SECRET=your-webhook-secret
DB_ROOT_PASSWORD=rootpass
DB_NAME=evosync
DB_USER=evosync

1
.gitignore vendored
View File

@@ -16,3 +16,4 @@ passwords.txt
.env
__pycache__/
*.pyc
certbot

View File

@@ -5,28 +5,46 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.8.2] - 2026-03-06
### Miscellaneous
- Replace EvoSync with ЭВОСИНК throughout UI
## [1.8.1] - 2026-03-06
### Documentation
- Update changelog for v1.7.3
- Fix changelog order — 1.8.0 before 1.7.3
### Other
- V1.8.1
## [1.7.3] - 2026-03-06
### Added
- Add nginx reverse proxy and Let's Encrypt TLS setup
### Other
- V1.7.3
## [1.8.0] - 2026-03-06
### Added
- Connections dashboard (`/connections`) — unified page for all service integrations with online/offline status indicators
- Add-connection page (`/connections/add`) — shows only unconnected services; "all connected" state when none remain
- VK OAuth connection — connect VK account via OAuth, store access token and profile info
- Background health checker — runs every 10 minutes, checks Evotor and VK tokens, updates `is_online` / `last_checked_at`
- Sync configuration page (`/sync`) — master enable/disable toggle, confirm-and-start button, filter summary, warnings for missing connections
- Catalog browser (`/catalog`) — browse Evotor stores, groups, and products in table views with cache auto-refresh on first visit
- Catalog filter management — include/exclude rules per store/group/product via inline dropdown; rules stored in `sync_filters` table
- Catalog CSV export — download stores, groups, or products as UTF-8 BOM CSV (Excel-compatible)
- Alembic migrations for all new tables: `evotor_connections` (health fields), `vk_connections`, `sync_configs`, `sync_filters`, `cached_stores`, `cached_groups`, `cached_products`
- `run/read_config.py` — CLI helper for shell sync scripts to read per-user sync config as JSON
- Add Evotor OAuth connection feature with formatted phone input
- Add Alembic database migrations
- Add connections dashboard with background health checks
- Add VK OAuth connection with health checks
- Release v1.8.0 — connections dashboard, VK OAuth, sync config, catalog browser
### Changed
### Miscellaneous
- Navbar: replaced "Эвотор" link with "Подключения", added "Каталог" and "Синхронизация" links
- Evotor and VK connect/disconnect flows now redirect to `/connections`
- Back links on `/evotor` and `/vk` pages updated to "Вернуться к подключениям"
- VK connection card icon changed to `bi-bag` (shopping bag) to reflect VK Market use case
- Password reset and email confirmation pages: replaced dev-mode console instructions with user-facing copy
- Add semantic versioning and automatic changelog generation
## [1.7.2] - 2026-03-05

View File

@@ -1,13 +1,10 @@
FROM python:3.12-slim
FROM node:20-alpine
WORKDIR /app
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
COPY web/package*.json ./
RUN npm ci
COPY web/ ./web/
COPY alembic.ini .
COPY docker-entrypoint.sh .
RUN chmod +x docker-entrypoint.sh
COPY web/ .
RUN npm run build && cp -r src/templates dist/templates && cp -r static dist/static
CMD ["./docker-entrypoint.sh"]
CMD ["node", "dist/index.js"]

161
README.md
View File

@@ -1,3 +1,160 @@
# evo-sync
# ЭВОСИНК (EvoSync)
evo-sync is a command-line synchronization tool that fetches product, group, and store data from the Evo platform and syncs it with VK (VKontakte).
Сервис автоматической синхронизации товарного каталога из [Эвотор](https://evotor.ru) в [ВКонтакте](https://vk.com).
## Возможности
- Подключение аккаунта Эвотор через OAuth
- Подключение сообщества ВКонтакте через токен
- Фильтрация по магазинам, группам и товарам (включить/исключить)
- Автоматическая фоновая синхронизация по расписанию
- Создание, обновление и удаление товаров в ВК-магазине
- Личный кабинет с веб-интерфейсом
- Просмотр закешированного каталога товаров
## Стек технологий
- **Backend**: FastAPI, SQLAlchemy ORM, Alembic
- **База данных**: MariaDB (драйвер pymysql)
- **Шаблоны**: Jinja2 (интерфейс на русском языке)
- **Аутентификация**: Cookie-сессии, bcrypt
- **Деплой**: Docker Compose
## Быстрый старт
### Требования
- Docker и Docker Compose
- MariaDB/MySQL (можно использовать хост-машину или отдельный контейнер)
### Настройка
1. Скопируйте файл переменных окружения:
```bash
cp .env.example .env
```
2. Отредактируйте `.env`:
```env
# База данных
DATABASE_URL=mysql+pymysql://evosync:evosync@db:3306/evosync
# Безопасность (обязательно измените в production)
SECRET_KEY=your-random-secret-key-here
# URL приложения (используется в OAuth-редиректах)
BASE_URL=https://your-domain.ru
# Эвотор
EVOTOR_APP_ID=your-evotor-app-id
EVOTOR_WEBHOOK_SECRET=your-webhook-secret
# Для отдельного MySQL-контейнера (опционально)
DB_ROOT_PASSWORD=rootpass
DB_NAME=evosync
DB_USER=evosync
DB_PASSWORD=evosync
```
3. Запустите сервис:
```bash
docker compose up -d
```
Приложение будет доступно по адресу `http://localhost:8080`.
При старте контейнер автоматически применяет миграции базы данных (`alembic upgrade head`).
## Переменные окружения
| Переменная | Обязательно | По умолчанию | Описание |
|---|---|---|---|
| `DATABASE_URL` | Да | — | MySQL connection string (pymysql) |
| `SECRET_KEY` | Да | `change-me-in-production` | Ключ для подписи сессий |
| `BASE_URL` | Да | `http://localhost:8080` | Публичный URL (для OAuth-callback) |
| `EVOTOR_APP_ID` | Да | — | ID приложения Эвотор |
| `EVOTOR_WEBHOOK_SECRET` | Да | — | Секрет для верификации вебхуков Эвотор |
| `VK_API_VERSION` | Нет | `5.131` | Версия VK API |
| `VK_DEFAULT_PHOTO_PATH` | Нет | `/app/default_product.png` | Путь к изображению товара по умолчанию |
| `JIVOSITE_WIDGET_ID` | Нет | — | ID виджета Jivosite (онлайн-чат) |
| `SYNC_INTERVAL_SECONDS` | Нет | `3600` | Интервал синхронизации (сек) |
| `CATALOG_REFRESH_INTERVAL_SECONDS` | Нет | `3600` | Интервал обновления каталога (сек) |
| `HEALTH_CHECK_INTERVAL_SECONDS` | Нет | `600` | Интервал проверки соединений (сек) |
## Структура проекта
```
evo-sync/
├── web/
│ ├── main.py # FastAPI-приложение, регистрация роутеров, фоновые задачи
│ ├── config.py # Настройки из переменных окружения (pydantic-settings)
│ ├── models.py # SQLAlchemy-модели (User, EvotorConnection, VkConnection, ...)
│ ├── database.py # Движок и сессия SQLAlchemy
│ ├── auth.py # Хеширование паролей, работа с сессиями
│ ├── schemas.py # Pydantic-схемы для форм
│ ├── sync_engine.py # Фоновый движок синхронизации (Эвотор → ВК)
│ ├── routes/
│ │ ├── auth.py # Регистрация, вход, выход, подтверждение email
│ │ ├── profile.py # Профиль пользователя
│ │ ├── reset.py # Сброс пароля
│ │ ├── evotor.py # OAuth-подключение Эвотор
│ │ ├── vk.py # Подключение ВКонтакте (ввод токена)
│ │ ├── connections.py # Обзор всех подключений
│ │ ├── sync.py # Настройка и управление синхронизацией
│ │ └── catalog.py # Просмотр закешированного каталога
│ ├── templates/ # Jinja2-шаблоны (русский интерфейс)
│ └── migrations/ # Alembic-миграции
├── Dockerfile.web # Docker-образ веб-приложения (Python 3.12-slim)
├── docker-compose.yml # Оркестрация сервисов
├── docker-entrypoint.sh # Скрипт запуска контейнера
├── alembic.ini # Конфигурация миграций
├── requirements.txt # Python-зависимости
└── .env.example # Шаблон переменных окружения
```
## Модели базы данных
| Модель | Таблица | Назначение |
|---|---|---|
| `User` | `users` | Аккаунт пользователя |
| `EvotorConnection` | `evotor_connections` | OAuth-токен Эвотор |
| `VkConnection` | `vk_connections` | Токен сообщества ВКонтакте |
| `SyncConfig` | `sync_configs` | Настройки синхронизации пользователя |
| `SyncFilter` | `sync_filters` | Фильтры по магазинам/группам/товарам |
| `CachedStore` | `cached_stores` | Кеш магазинов Эвотор |
| `CachedGroup` | `cached_groups` | Кеш групп товаров Эвотор |
| `CachedProduct` | `cached_products` | Кеш товаров Эвотор + статус синхронизации |
## Как работает синхронизация
1. По расписанию (каждые `SYNC_INTERVAL_SECONDS` секунд) запускается `sync_engine.run_sync()`
2. Для каждого пользователя с активным `SyncConfig` и подключёнными Эвотор и ВК:
- Загружаются товары и группы из Эвотор API
- Применяются фильтры (включить/исключить магазины, группы, товары)
- Загружаются текущие товары и альбомы из ВК
- Создаются/обновляются/удаляются альбомы и товары в ВК-магазине
- В БД обновляется поле `synced_at` у синхронизированных товаров
**Особенности:**
- Товары на развес (единицы измерения в граммах) получают скорректированную цену (×10)
- Совпадение товаров ВК и Эвотор происходит по нормализованному названию
- Товары с `allow_to_sell=false` не синхронизируются в ВК
## Разработка
Для локальной разработки с горячей перезагрузкой кода папка `./web` монтируется в контейнер как volume. После изменения Python-файлов uvicorn перезапустится автоматически.
Создание новой миграции:
```bash
docker compose exec web alembic revision --autogenerate -m "описание изменений"
```
Применение миграций вручную:
```bash
docker compose exec web alembic upgrade head
```

View File

@@ -5,21 +5,24 @@ services:
build:
context: .
dockerfile: Dockerfile.web
expose:
- "8000"
ports:
- "8080:3000"
environment:
- DATABASE_URL=mysql+pymysql://${DB_USER}:${DB_PASSWORD}@172.25.0.1:3306/${DB_NAME}
- DATABASE_URL=mysql://${DB_USER}:${DB_PASSWORD}@host.docker.internal:3306/${DB_NAME}
- SECRET_KEY=${SECRET_KEY:-change-me-in-production}
- BASE_URL=${BASE_URL:-https://evosync.ru}
- EVOTOR_CLIENT_ID=${EVOTOR_CLIENT_ID}
- EVOTOR_CLIENT_SECRET=${EVOTOR_CLIENT_SECRET}
- EVOTOR_APP_ID=${EVOTOR_APP_ID}
- EVOTOR_WEBHOOK_SECRET=${EVOTOR_WEBHOOK_SECRET}
- VK_CLIENT_ID=${VK_CLIENT_ID}
- VK_CLIENT_SECRET=${VK_CLIENT_SECRET}
- JIVOSITE_WIDGET_ID=${JIVOSITE_WIDGET_ID}
- NODE_ENV=production
- VK_DEFAULT_PHOTO_PATH=/app/default_product.png
volumes:
- ./web:/app/web
- ./alembic.ini:/app/alembic.ini
- ./docker-entrypoint.sh:/app/docker-entrypoint.sh
- ./5393364294319597854.png:/app/default_product.png:ro
restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"
# sync:
# build:

View File

@@ -1,3 +1,7 @@
upstream web {
server 127.0.0.1:8080;
}
server {
listen 80;
server_name evosync.ru www.evosync.ru;
@@ -23,7 +27,7 @@ server {
ssl_prefer_server_ciphers on;
location / {
proxy_pass http://web:8000;
proxy_pass http://web;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

View File

@@ -0,0 +1,57 @@
#!/usr/bin/env bash
# Obtain an Evotor developer access token via password grant (no browser required).
# Uses dev.evotor.ru credentials (your Evotor developer account).
#
# Usage: ./scripts/evotor-get-token.sh
set -euo pipefail
# Load .env if present
if [[ -f .env ]]; then
set -a; source .env; set +a
fi
EVOTOR_TOKEN_URL="https://dev.evotor.ru/oauth/token"
# Prompt for credentials
read -rp "Evotor developer login (email): " EVOTOR_LOGIN
read -rsp "Evotor developer password: " EVOTOR_PASSWORD
echo
echo
echo "A 2FA code will be sent to your email if this IP is not recognized."
read -rp "2FA code (leave blank if not required): " EVOTOR_2FA
# Build request body
BODY="type=LOGIN&grant_type=password&client_id=Evo-UI&username=$(python3 -c "import urllib.parse,sys; print(urllib.parse.quote(sys.argv[1]))" "$EVOTOR_LOGIN")&password=$(python3 -c "import urllib.parse,sys; print(urllib.parse.quote(sys.argv[1]))" "$EVOTOR_PASSWORD")"
EXTRA_HEADERS=()
if [[ -n "$EVOTOR_2FA" ]]; then
EXTRA_HEADERS+=(-H "2fa_confirmation: $EVOTOR_2FA")
fi
echo
echo "Requesting token..."
RESPONSE=$(curl -s -X POST "$EVOTOR_TOKEN_URL" \
-H "Content-Type: application/x-www-form-urlencoded" \
"${EXTRA_HEADERS[@]}" \
-d "$BODY")
echo
echo "Response:"
echo "$RESPONSE" | python3 -m json.tool 2>/dev/null || echo "$RESPONSE"
ACCESS_TOKEN=$(echo "$RESPONSE" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('access_token',''))" 2>/dev/null || true)
if [[ -z "$ACCESS_TOKEN" ]]; then
echo
echo "ERROR: No access_token in response." >&2
exit 1
fi
echo
echo "Access token:"
echo "$ACCESS_TOKEN"
echo
echo "To save this token to .env, add or update:"
echo " EVOTOR_ACCESS_TOKEN=$ACCESS_TOKEN"

View File

@@ -1,57 +1,46 @@
#!/bin/bash
# Obtain TLS certificates from Let's Encrypt for evosync.ru
# Run once on first deploy: sudo ./scripts/init-letsencrypt.sh
# Requires nginx running on the host with acme-challenge location configured
set -euo pipefail
DOMAIN="evosync.ru"
EMAIL="${LETSENCRYPT_EMAIL:-admin@evosync.ru}"
COMPOSE="docker compose"
CERTBOT_DIR="./certbot"
ACME_DIR="/var/www/certbot"
echo "==> Creating certbot directories..."
mkdir -p "$CERTBOT_DIR/conf" "$CERTBOT_DIR/www"
echo "==> Starting nginx (HTTP only, for ACME challenge)..."
# Temporarily use a basic config that doesn't require certs
cat > nginx/nginx-temp.conf <<'TMPCONF'
server {
listen 80;
server_name evosync.ru www.evosync.ru;
location /.well-known/acme-challenge/ {
root /var/www/certbot;
}
location / {
return 200 'Setting up TLS...';
add_header Content-Type text/plain;
}
}
TMPCONF
$COMPOSE up -d nginx
echo "==> Ensuring acme-challenge directory exists on host..."
sudo mkdir -p "$ACME_DIR"
sudo chmod 755 "$ACME_DIR"
echo "==> Requesting certificate from Let's Encrypt..."
docker run --rm \
-v "$(pwd)/$CERTBOT_DIR/conf:/etc/letsencrypt" \
-v "$(pwd)/$CERTBOT_DIR/www:/var/www/certbot" \
--network "${COMPOSE_PROJECT_NAME:-evo-syncgit}_default" \
certbot/certbot certonly \
sudo certbot certonly \
--webroot \
--webroot-path=/var/www/certbot \
--webroot-path="$ACME_DIR" \
--email "$EMAIL" \
--agree-tos \
--no-eff-email \
-d "$DOMAIN" \
-d "www.$DOMAIN"
echo "==> Restoring production nginx config..."
rm -f nginx/nginx-temp.conf
echo "==> Restarting nginx with TLS..."
$COMPOSE restart nginx
echo "==> Copying certificates to project directory..."
sudo cp "/etc/letsencrypt/live/$DOMAIN/fullchain.pem" "$CERTBOT_DIR/conf/fullchain.pem"
sudo cp "/etc/letsencrypt/live/$DOMAIN/privkey.pem" "$CERTBOT_DIR/conf/privkey.pem"
sudo chown "$(whoami):$(whoami)" "$CERTBOT_DIR/conf"/*.pem
echo "==> Done! TLS certificate installed for $DOMAIN"
echo ""
echo "Certificate files:"
echo " - $CERTBOT_DIR/conf/fullchain.pem"
echo " - $CERTBOT_DIR/conf/privkey.pem"
echo ""
echo "Configure nginx:"
echo " ssl_certificate $CERTBOT_DIR/conf/fullchain.pem;"
echo " ssl_certificate_key $CERTBOT_DIR/conf/privkey.pem;"
echo ""
echo "Set up auto-renewal with: sudo crontab -e"
echo " Add: 0 3 * * * cd $(pwd) && docker run --rm -v $(pwd)/$CERTBOT_DIR/conf:/etc/letsencrypt -v $(pwd)/$CERTBOT_DIR/www:/var/www/certbot certbot/certbot renew --quiet && docker compose restart nginx"
echo "Add: 0 3 * * * certbot renew --quiet && systemctl reload nginx"

View File

@@ -1 +1 @@
1.7.3
1.9.0

View File

@@ -4,18 +4,22 @@ from pydantic_settings import BaseSettings
class Settings(BaseSettings):
DATABASE_URL: str = "mysql+pymysql://evosync:evosync@localhost:3306/evosync"
SECRET_KEY: str = "change-me-in-production"
BASE_URL: str = "http://localhost:8000"
BASE_URL: str = "http://localhost:8080"
PASSWORD_RESET_EXPIRE_MINUTES: int = 60
EVOTOR_CLIENT_ID: str = ""
EVOTOR_CLIENT_SECRET: str = ""
EVOTOR_SCOPES: str = "store:read product:read"
EVOTOR_APP_ID: str = ""
EVOTOR_WEBHOOK_SECRET: str = ""
JIVOSITE_WIDGET_ID: str = ""
HEALTH_CHECK_INTERVAL_SECONDS: int = 600
CATALOG_REFRESH_INTERVAL_SECONDS: int = 3600
SYNC_INTERVAL_SECONDS: int = 3600
VK_DEFAULT_PHOTO_PATH: str = "/app/default_product.png"
VK_CLIENT_ID: str = ""
VK_CLIENT_SECRET: str = ""
VK_SCOPES: str = "market groups offline"
VK_API_VERSION: str = "5.131"
# Docker compose vars (ignored in app, kept for env compatibility)

View File

@@ -33,6 +33,8 @@ async def fetch_groups(access_token: str, store_id: str) -> list[dict]:
headers={"Authorization": f"Bearer {access_token}"},
timeout=15,
)
if resp.status_code == 402:
return []
resp.raise_for_status()
data = resp.json()
items = data.get("items", data) if isinstance(data, dict) else data
@@ -46,6 +48,8 @@ async def fetch_products(access_token: str, store_id: str) -> list[dict]:
headers={"Authorization": f"Bearer {access_token}"},
timeout=15,
)
if resp.status_code == 402:
return []
resp.raise_for_status()
data = resp.json()
items = data.get("items", data) if isinstance(data, dict) else data

View File

@@ -5,13 +5,13 @@ from datetime import datetime, timedelta
import httpx
from web.database import SessionLocal
from web.models import EvotorConnection, VkConnection
from web.models import EvotorConnection, VkConnection, CachedStore
logger = logging.getLogger("uvicorn.error")
EVOTOR_STORES_URL = "https://api.evotor.ru/stores"
EVOTOR_TOKEN_URL = "https://oauth.evotor.ru/oauth/token"
VK_USERS_GET_URL = "https://api.vk.com/method/users.get"
VK_GROUPS_GET_URL = "https://api.vk.com/method/groups.getById"
VK_API_VERSION = "5.131"
# Refresh Evotor token if it expires within this window
@@ -59,7 +59,7 @@ async def check_vk_connection(access_token: str) -> bool:
try:
async with httpx.AsyncClient() as client:
resp = await client.get(
VK_USERS_GET_URL,
VK_GROUPS_GET_URL,
params={"access_token": access_token, "v": VK_API_VERSION},
timeout=10,
)
@@ -116,10 +116,28 @@ async def run_health_checks() -> None:
conn.last_checked_at = now
db.commit()
# Refresh catalog cache for online Evotor connections
from web.config import settings
refreshed_catalog = 0
for conn in evotor_connections:
if not conn.is_online:
continue
cached = db.query(CachedStore).filter(CachedStore.user_id == conn.user_id).first()
cache_age = (now - cached.fetched_at).total_seconds() if cached else None
if cached is None or cache_age >= settings.CATALOG_REFRESH_INTERVAL_SECONDS:
try:
from web.evotor_api import refresh_catalog_cache
await refresh_catalog_cache(conn.user_id, conn.access_token, db)
refreshed_catalog += 1
except Exception:
logger.exception("Failed to refresh catalog cache for user_id=%d", conn.user_id)
logger.info(
"Health checks completed: %d Evotor, %d VK",
"Health checks completed: %d Evotor, %d VK, %d catalogs refreshed",
len(evotor_connections),
len(vk_connections),
refreshed_catalog,
)
except Exception:
logger.exception("Error during health checks")

View File

@@ -9,6 +9,7 @@ from starlette.middleware.sessions import SessionMiddleware
from web.auth import get_current_user
from web.config import settings
from web.health_checker import health_check_loop
from web.sync_engine import sync_loop
from web.models import User
from web.routes import auth, profile, reset, evotor, vk, sync, catalog
from web.routes import connections
@@ -16,16 +17,21 @@ from web.routes import connections
@asynccontextmanager
async def lifespan(app: FastAPI):
task = asyncio.create_task(health_check_loop(settings.HEALTH_CHECK_INTERVAL_SECONDS))
tasks = [
asyncio.create_task(health_check_loop(settings.HEALTH_CHECK_INTERVAL_SECONDS)),
asyncio.create_task(sync_loop(settings.SYNC_INTERVAL_SECONDS)),
]
yield
task.cancel()
for t in tasks:
t.cancel()
for t in tasks:
try:
await task
await t
except asyncio.CancelledError:
pass
app = FastAPI(title="EvoSync — Личный кабинет", lifespan=lifespan)
app = FastAPI(title="ЭВОСИНК — Личный кабинет", lifespan=lifespan)
app.add_middleware(SessionMiddleware, secret_key=settings.SECRET_KEY)
app.mount("/static", StaticFiles(directory="web/static"), name="static")

View File

@@ -0,0 +1,26 @@
"""add synced_at to cached_products
Revision ID: a7b8c9d0e1f2
Revises: f6a7b8c9d0e1
Branch Labels: None
Depends On: None
"""
from alembic import op
import sqlalchemy as sa
revision = "a7b8c9d0e1f2"
down_revision = "f6a7b8c9d0e1"
branch_labels = None
depends_on = None
def upgrade():
op.add_column(
"cached_products",
sa.Column("synced_at", sa.DateTime(), nullable=True),
)
def downgrade():
op.drop_column("cached_products", "synced_at")

View File

@@ -0,0 +1,53 @@
"""evotor webhook token flow: add evotor_user_id, make user_id nullable
Revision ID: f6a7b8c9d0e1
Revises: e5f6a7b8c9d0
Branch Labels: None
Depends On: None
"""
from alembic import op
import sqlalchemy as sa
revision = 'f6a7b8c9d0e1'
down_revision = 'e5f6a7b8c9d0'
branch_labels = None
depends_on = None
def upgrade() -> None:
conn = op.get_bind()
# Check existing columns
columns = [row[0] for row in conn.execute(sa.text(
"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS "
"WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'evotor_connections'"
))]
if 'evotor_user_id' not in columns:
op.add_column('evotor_connections',
sa.Column('evotor_user_id', sa.String(255), nullable=True))
# Check existing indexes
indexes = [row[2] for row in conn.execute(sa.text(
"SHOW INDEX FROM evotor_connections"
))]
if 'uq_evotor_connections_evotor_user_id' not in indexes:
op.create_unique_constraint('uq_evotor_connections_evotor_user_id',
'evotor_connections', ['evotor_user_id'])
if 'ix_evotor_connections_evotor_user_id' not in indexes:
op.create_index('ix_evotor_connections_evotor_user_id',
'evotor_connections', ['evotor_user_id'])
op.alter_column('evotor_connections', 'user_id',
existing_type=sa.Integer(), nullable=True)
def downgrade() -> None:
op.alter_column('evotor_connections', 'user_id',
existing_type=sa.Integer(), nullable=False)
op.drop_index('ix_evotor_connections_evotor_user_id', 'evotor_connections')
op.drop_constraint('uq_evotor_connections_evotor_user_id', 'evotor_connections')
op.drop_column('evotor_connections', 'evotor_user_id')

View File

@@ -33,7 +33,8 @@ class EvotorConnection(Base):
__tablename__ = "evotor_connections"
id = Column(Integer, primary_key=True, autoincrement=True)
user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), unique=True, nullable=False)
user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), unique=True, nullable=True)
evotor_user_id = Column(String(255), unique=True, nullable=True, index=True)
access_token = Column(Text, nullable=False)
store_id = Column(String(255), nullable=True)
store_name = Column(String(255), nullable=True)
@@ -148,6 +149,7 @@ class CachedProduct(Base):
article_number = Column(String(100), nullable=True)
allow_to_sell = Column(Boolean, nullable=True)
fetched_at = Column(DateTime, nullable=False)
synced_at = Column(DateTime, nullable=True)
__table_args__ = (
UniqueConstraint("user_id", "evotor_id"),

View File

@@ -2,7 +2,7 @@ import uuid
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import hash_password, verify_password, get_current_user
@@ -12,7 +12,6 @@ from web.models import User
from web.schemas import validate_registration, validate_login
router = APIRouter()
templates = Jinja2Templates(directory="web/templates")
@router.get("/register")

View File

@@ -3,7 +3,7 @@ import io
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse, StreamingResponse
from fastapi.templating import Jinja2Templates
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import get_current_user
@@ -12,7 +12,6 @@ from web.evotor_api import refresh_catalog_cache
from web.models import User, EvotorConnection, SyncConfig, SyncFilter, CachedStore, CachedGroup, CachedProduct
router = APIRouter(prefix="/catalog")
templates = Jinja2Templates(directory="web/templates")
def _get_or_create_sync_config(db: Session, user_id: int) -> SyncConfig:

View File

@@ -1,6 +1,6 @@
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import get_current_user
@@ -8,7 +8,6 @@ from web.database import get_db
from web.models import User, EvotorConnection, VkConnection
router = APIRouter()
templates = Jinja2Templates(directory="web/templates")
SERVICE_TYPES = [
{
@@ -17,7 +16,7 @@ SERVICE_TYPES = [
"icon": "bi-shop",
"description": "Подключите кассу Эвотор для синхронизации каталога товаров.",
"configure_url": "/evotor",
"connect_url": "/evotor/connect",
"connect_url": "/evotor",
},
{
"type": "vk",
@@ -25,7 +24,7 @@ SERVICE_TYPES = [
"icon": "bi-bag",
"description": "Подключите аккаунт ВКонтакте для публикации товаров в вашу группу.",
"configure_url": "/vk",
"connect_url": "/vk/connect",
"connect_url": "/vk",
},
]

193
web-python/routes/evotor.py Normal file
View File

@@ -0,0 +1,193 @@
import logging
import httpx
from datetime import datetime
from fastapi import APIRouter, Request, Depends, HTTPException
from fastapi.responses import RedirectResponse, JSONResponse
from web.templates_env import templates
from pydantic import BaseModel
from sqlalchemy.orm import Session
from web.auth import get_current_user
from web.config import settings
from web.database import get_db
from web.models import User, EvotorConnection
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/evotor")
EVOTOR_APP_URL = "https://market.evotor.ru/store/apps/{app_id}"
EVOTOR_STORES_URL = "https://api.evotor.ru/stores"
@router.get("")
def evotor_page(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(EvotorConnection).filter(EvotorConnection.user_id == user.id).first()
error = request.query_params.get("error")
app_url = EVOTOR_APP_URL.format(app_id=settings.EVOTOR_APP_ID) if settings.EVOTOR_APP_ID else None
return templates.TemplateResponse("evotor.html", {
"request": request,
"user": user,
"connection": connection,
"error": error,
"app_url": app_url,
})
class EvotorTokenPayload(BaseModel):
userId: str
token: str
@router.post("/callback")
async def evotor_callback(
request: Request,
payload: EvotorTokenPayload,
db: Session = Depends(get_db),
):
"""
Webhook endpoint: Evotor POSTs {"userId": "...", "token": "..."} here
after the user authorizes the app in their Evotor account.
"""
# Verify the Authorization header matches our configured webhook secret
if settings.EVOTOR_WEBHOOK_SECRET:
auth_header = request.headers.get("Authorization", "")
expected = f"Bearer {settings.EVOTOR_WEBHOOK_SECRET}"
if auth_header != expected:
logger.warning("Evotor webhook: invalid Authorization header")
raise HTTPException(status_code=401, detail="Unauthorized")
now = datetime.utcnow()
# Fetch store info using the received token
store_id = None
store_name = None
try:
async with httpx.AsyncClient() as client:
stores_response = await client.get(
EVOTOR_STORES_URL,
headers={"Authorization": f"Bearer {payload.token}"},
timeout=15,
)
if stores_response.status_code == 200:
stores = stores_response.json()
items = stores.get("items", stores) if isinstance(stores, dict) else stores
if items:
store_id = items[0].get("uuid") or items[0].get("id")
store_name = items[0].get("name")
except Exception:
pass # Store info is optional
# Upsert by evotor_user_id (user_id stays NULL until /evotor/link is called)
connection = db.query(EvotorConnection).filter(
EvotorConnection.evotor_user_id == payload.userId
).first()
if connection:
connection.access_token = payload.token
connection.store_id = store_id
connection.store_name = store_name
connection.is_online = True
connection.last_checked_at = now
connection.updated_at = now
else:
connection = EvotorConnection(
evotor_user_id=payload.userId,
access_token=payload.token,
store_id=store_id,
store_name=store_name,
is_online=True,
last_checked_at=now,
)
db.add(connection)
db.commit()
logger.info("Evotor webhook: saved token for evotor_user_id=%s", payload.userId)
return JSONResponse({"status": "ok"})
@router.post("/token")
async def evotor_token_manual(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
"""Allow user to manually paste their Evotor token."""
if not user:
return RedirectResponse("/login", 303)
form = await request.form()
token = (form.get("token") or "").strip()
if not token:
return RedirectResponse("/evotor?error=empty_token", 303)
now = datetime.utcnow()
# Fetch store info
store_id = None
store_name = None
try:
async with httpx.AsyncClient() as client:
stores_response = await client.get(
EVOTOR_STORES_URL,
headers={"Authorization": f"Bearer {token}"},
timeout=15,
)
if stores_response.status_code == 200:
stores = stores_response.json()
items = stores.get("items", stores) if isinstance(stores, dict) else stores
if items:
store_id = items[0].get("uuid") or items[0].get("id")
store_name = items[0].get("name")
elif stores_response.status_code == 401:
return RedirectResponse("/evotor?error=invalid_token", 303)
except Exception:
pass
connection = db.query(EvotorConnection).filter(EvotorConnection.user_id == user.id).first()
if connection:
connection.access_token = token
connection.store_id = store_id
connection.store_name = store_name
connection.is_online = True
connection.last_checked_at = now
connection.updated_at = now
else:
connection = EvotorConnection(
user_id=user.id,
access_token=token,
store_id=store_id,
store_name=store_name,
is_online=True,
last_checked_at=now,
)
db.add(connection)
db.commit()
return RedirectResponse("/connections", 303)
@router.post("/disconnect")
async def evotor_disconnect(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(EvotorConnection).filter(EvotorConnection.user_id == user.id).first()
if connection:
db.delete(connection)
db.commit()
return RedirectResponse("/connections", 303)

View File

@@ -1,6 +1,6 @@
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import get_current_user, verify_password, hash_password
@@ -9,7 +9,6 @@ from web.models import User
from web.schemas import validate_profile, validate_reset_password
router = APIRouter()
templates = Jinja2Templates(directory="web/templates")
# VIEW PROFILE

View File

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta, timezone
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import hash_password
@@ -13,7 +13,6 @@ from web.models import User
from web.schemas import validate_reset_password
router = APIRouter()
templates = Jinja2Templates(directory="web/templates")
@router.get("/forgot-password")

View File

@@ -2,7 +2,7 @@ from datetime import datetime
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import get_current_user
@@ -10,7 +10,6 @@ from web.database import get_db
from web.models import User, EvotorConnection, VkConnection, SyncConfig, SyncFilter
router = APIRouter(prefix="/sync")
templates = Jinja2Templates(directory="web/templates")
def _get_or_create_sync_config(db: Session, user_id: int) -> SyncConfig:

168
web-python/routes/vk.py Normal file
View File

@@ -0,0 +1,168 @@
from datetime import datetime
from urllib.parse import urlencode
import httpx
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from web.templates_env import templates
from sqlalchemy.orm import Session
from web.auth import get_current_user
from web.config import settings
from web.database import get_db
from web.models import User, VkConnection
router = APIRouter(prefix="/vk")
VK_API_URL = "https://api.vk.com/method"
VK_OAUTH_URL = "https://oauth.vk.com/authorize"
async def _fetch_group_info(token: str) -> tuple[str | None, str | None]:
"""Returns (group_id, group_name) for the first admin group, or (None, None)."""
try:
async with httpx.AsyncClient() as client:
resp = await client.get(
f"{VK_API_URL}/groups.get",
params={
"access_token": token,
"v": settings.VK_API_VERSION,
"filter": "admin",
"extended": 1,
"count": 1,
},
timeout=15,
)
if resp.status_code == 200:
data = resp.json()
if "error" not in data:
items = data.get("response", {}).get("items", [])
if items:
return str(items[0].get("id", "")), items[0].get("name")
except Exception:
pass
return None, None
def _save_connection(db: Session, user_id: int, token: str,
group_id: str | None, group_name: str | None) -> None:
now = datetime.utcnow()
connection = db.query(VkConnection).filter(VkConnection.user_id == user_id).first()
if connection:
connection.access_token = token
connection.vk_user_id = group_id
connection.first_name = group_name
connection.last_name = None
connection.is_online = True
connection.last_checked_at = now
else:
db.add(VkConnection(
user_id=user_id,
access_token=token,
vk_user_id=group_id,
first_name=group_name,
last_name=None,
is_online=True,
last_checked_at=now,
))
db.commit()
@router.get("")
def vk_page(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(VkConnection).filter(VkConnection.user_id == user.id).first()
error = request.query_params.get("error")
return templates.TemplateResponse("vk.html", {
"request": request,
"user": user,
"connection": connection,
"error": error,
"vk_client_id": settings.VK_CLIENT_ID,
"callback_url": f"{settings.BASE_URL}/vk/callback",
})
@router.get("/connect")
def vk_connect(
request: Request,
user: User | None = Depends(get_current_user),
):
"""Redirect to VK OAuth authorization page."""
if not user:
return RedirectResponse("/login", 303)
if not settings.VK_CLIENT_ID:
return RedirectResponse("/vk?error=no_client_id", 303)
params = urlencode({
"client_id": settings.VK_CLIENT_ID,
"scope": "market,groups",
"redirect_uri": f"{settings.BASE_URL}/vk/callback",
"display": "page",
"response_type": "token",
"v": settings.VK_API_VERSION,
})
return RedirectResponse(f"{VK_OAUTH_URL}?{params}", 302)
@router.get("/callback")
def vk_callback(
request: Request,
user: User | None = Depends(get_current_user),
):
"""Landing page after VK OAuth. JS reads the token from the URL fragment and POSTs it."""
if not user:
return RedirectResponse("/login", 303)
return templates.TemplateResponse("vk_callback.html", {
"request": request,
"user": user,
})
@router.post("/token")
async def vk_token(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
"""Save a VK user access token (from manual entry or OAuth callback)."""
if not user:
return RedirectResponse("/login", 303)
form = await request.form()
token = (form.get("token") or "").strip()
if not token:
return RedirectResponse("/vk?error=empty_token", 303)
group_id, group_name = await _fetch_group_info(token)
if not group_id:
return RedirectResponse("/vk?error=invalid_token", 303)
_save_connection(db, user.id, token, group_id, group_name)
return RedirectResponse("/connections", 303)
@router.post("/disconnect")
async def vk_disconnect(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(VkConnection).filter(VkConnection.user_id == user.id).first()
if connection:
db.delete(connection)
db.commit()
return RedirectResponse("/connections", 303)

View File

@@ -0,0 +1,39 @@
/* Brand overrides */
:root {
--bs-primary: #F05023;
--bs-primary-rgb: 240, 80, 35;
--bs-link-color: #0986E2;
--bs-link-hover-color: #0670c0;
}
.brand-logo {
font-size: 22px;
font-weight: 700;
color: #F05023 !important;
}
.brand-border {
border-color: #F05023 !important;
}
.btn-primary {
--bs-btn-bg: #F05023;
--bs-btn-border-color: #F05023;
--bs-btn-hover-bg: #d44420;
--bs-btn-hover-border-color: #d44420;
--bs-btn-active-bg: #c03d1c;
--bs-btn-active-border-color: #c03d1c;
}
.btn-secondary {
--bs-btn-bg: #0986E2;
--bs-btn-border-color: #0986E2;
--bs-btn-hover-bg: #0770c0;
--bs-btn-hover-border-color: #0770c0;
--bs-btn-active-bg: #065fa3;
--bs-btn-active-border-color: #065fa3;
}
.nav-link:hover {
color: #F05023 !important;
}

485
web-python/sync_engine.py Normal file
View File

@@ -0,0 +1,485 @@
"""
Sync engine: syncs Evotor products to VK market for all enabled users.
Runs as a background asyncio loop inside the web app.
"""
import asyncio
import logging
from datetime import datetime
import httpx
from sqlalchemy.orm import Session
from web.database import SessionLocal
from web.models import CachedProduct, EvotorConnection, VkConnection, SyncConfig, SyncFilter
logger = logging.getLogger("uvicorn.error")
VK_API_HOST = "https://api.vk.ru/method"
VK_API_VERSION = "5.199"
EVOTOR_API_BASE = "https://api.evotor.ru"
VK_CATEGORY_ID = 40932
VK_STOCK_AMOUNT = 1000
WEIGHT_PRICE_MULTIPLIER = 10
WEIGHT_MEASURES = {"г", "г.", "грамм", "граммов", "гр", "гр."}
def _is_weight_measure(measure: str | None) -> bool:
if not measure:
return False
return measure.strip().lower() in WEIGHT_MEASURES
def _normalize_name(name: str) -> str:
return name.strip().replace(";", ",")
def _calc_price(price_kopecks, measure: str | None) -> tuple[int, str]:
"""Returns (price_in_kopecks_for_vk, price_info_label)."""
base = int(price_kopecks or 0)
if _is_weight_measure(measure):
return base * WEIGHT_PRICE_MULTIPLIER, f"{WEIGHT_PRICE_MULTIPLIER}{measure}"
return base, measure or ""
def _build_description(name: str, price_info: str, extra_desc: str | None) -> str:
desc = f"{name} (цена за {price_info}.)\n\n"
if extra_desc:
desc += extra_desc
return desc
def _get_included_store_ids(filters: list) -> list[str]:
return [f.entity_id for f in filters if f.entity_type == "store" and f.filter_mode == "include"]
def _is_group_included(group_id: str | None, filters: list) -> bool:
"""Returns True if the group should be synced based on filters."""
group_filters = {f.entity_id: f.filter_mode for f in filters if f.entity_type == "group"}
if not group_filters:
return True # no group filters → include all
mode = group_filters.get(group_id)
if mode == "exclude":
return False
if mode == "include":
return True
# Not mentioned — include if there are only excludes, exclude if there are only includes
has_includes = any(v == "include" for v in group_filters.values())
return not has_includes
def _is_product_included(product_id: str, filters: list) -> bool:
product_filters = {f.entity_id: f.filter_mode for f in filters if f.entity_type == "product"}
if not product_filters:
return True
mode = product_filters.get(product_id)
if mode == "exclude":
return False
if mode == "include":
return True
has_includes = any(v == "include" for v in product_filters.values())
return not has_includes
# ---------------------------------------------------------------------------
# Evotor API helpers
# ---------------------------------------------------------------------------
async def _evo_fetch_products(token: str, store_id: str) -> list[dict]:
async with httpx.AsyncClient() as client:
resp = await client.get(
f"{EVOTOR_API_BASE}/stores/{store_id}/products",
headers={"Authorization": f"Bearer {token}"},
timeout=30,
)
if resp.status_code in (402, 404):
return []
resp.raise_for_status()
data = resp.json()
return data.get("items", data) if isinstance(data, dict) else data
async def _evo_fetch_groups(token: str, store_id: str) -> list[dict]:
async with httpx.AsyncClient() as client:
resp = await client.get(
f"{EVOTOR_API_BASE}/stores/{store_id}/product-groups",
headers={"Authorization": f"Bearer {token}"},
timeout=30,
)
if resp.status_code in (402, 404):
return []
resp.raise_for_status()
data = resp.json()
return data.get("items", data) if isinstance(data, dict) else data
# ---------------------------------------------------------------------------
# VK API helpers
# ---------------------------------------------------------------------------
def _vk_params(token: str, **extra) -> dict:
return {"access_token": token, "v": VK_API_VERSION, **extra}
async def _vk_get_albums(token: str, owner_id: str) -> list[dict]:
async with httpx.AsyncClient() as client:
resp = await client.get(
f"{VK_API_HOST}/market.getAlbums",
params=_vk_params(token, owner_id=owner_id, count=200),
timeout=30,
)
resp.raise_for_status()
data = resp.json()
return data.get("response", {}).get("items", [])
async def _vk_create_album(token: str, owner_id: str, title: str) -> int | None:
async with httpx.AsyncClient() as client:
resp = await client.post(
f"{VK_API_HOST}/market.addAlbum",
data=_vk_params(token, owner_id=owner_id, title=title),
timeout=30,
)
resp.raise_for_status()
data = resp.json()
if "error" in data:
logger.error("VK create album error: %s", data["error"])
return None
return data.get("response", {}).get("market_album_id")
async def _vk_get_products(token: str, owner_id: str) -> list[dict]:
"""Fetch all VK market items (handles pagination)."""
items = []
offset = 0
count = 200
async with httpx.AsyncClient() as client:
while True:
resp = await client.get(
f"{VK_API_HOST}/market.get",
params=_vk_params(token, owner_id=owner_id, extended=1,
with_disabled=1, count=count, offset=offset),
timeout=30,
)
resp.raise_for_status()
data = resp.json()
batch = data.get("response", {}).get("items", [])
items.extend(batch)
if len(batch) < count:
break
offset += count
return items
async def _vk_upload_photo(token: str, group_id: str, photo_path: str) -> str | None:
"""Upload a photo and return photo_id."""
async with httpx.AsyncClient() as client:
# Get upload URL
resp = await client.get(
f"{VK_API_HOST}/market.getProductPhotoUploadServer",
params=_vk_params(token, group_id=group_id),
timeout=30,
)
resp.raise_for_status()
data = resp.json()
if "error" in data:
logger.error("VK get upload URL error: %s", data["error"])
return None
upload_url = data.get("response", {}).get("upload_url")
if not upload_url:
return None
# Upload photo
with open(photo_path, "rb") as f:
upload_resp = await client.post(upload_url, files={"file": f}, timeout=60)
upload_resp.raise_for_status()
upload_obj = upload_resp.json()
# Save photo
save_resp = await client.post(
f"{VK_API_HOST}/market.saveProductPhoto",
data=_vk_params(token, upload_response=upload_resp.text),
timeout=30,
)
save_resp.raise_for_status()
save_data = save_resp.json()
if "error" in save_data:
logger.error("VK save photo error: %s", save_data["error"])
return None
return save_data.get("response", {}).get("photo_id")
async def _vk_create_product(
token: str, owner_id: str, name: str, description: str,
price: int, stock_amount: int, photo_id: str, album_id: int | None,
) -> int | None:
params = _vk_params(
token,
owner_id=owner_id,
name=name,
description=description,
category_id=VK_CATEGORY_ID,
price=price,
main_photo_id=photo_id,
stock_amount=stock_amount,
)
async with httpx.AsyncClient() as client:
resp = await client.post(f"{VK_API_HOST}/market.add", data=params, timeout=30)
resp.raise_for_status()
data = resp.json()
if "error" in data:
logger.error("VK create product error: %s", data["error"])
return None
product_id = data.get("response", {}).get("market_item_id")
if product_id and album_id:
await client.get(
f"{VK_API_HOST}/market.addToAlbum",
params=_vk_params(token, owner_id=owner_id,
item_ids=product_id, album_ids=album_id),
timeout=30,
)
return product_id
async def _vk_edit_product(
token: str, owner_id: str, item_id: int, name: str,
description: str, price: int, stock_amount: int,
) -> None:
params = _vk_params(
token,
owner_id=owner_id,
item_id=item_id,
name=name,
description=description,
category_id=VK_CATEGORY_ID,
price=price,
stock_amount=stock_amount,
)
async with httpx.AsyncClient() as client:
resp = await client.post(f"{VK_API_HOST}/market.edit", data=params, timeout=30)
resp.raise_for_status()
data = resp.json()
if "error" in data:
logger.error("VK edit product error: %s", data["error"])
async def _vk_delete_product(token: str, owner_id: str, item_id: int) -> None:
async with httpx.AsyncClient() as client:
resp = await client.post(
f"{VK_API_HOST}/market.delete",
data=_vk_params(token, owner_id=owner_id, item_id=item_id),
timeout=30,
)
resp.raise_for_status()
# ---------------------------------------------------------------------------
# Main sync logic per user
# ---------------------------------------------------------------------------
def _stamp_synced(db: Session, user_id: int, evo_id: str, now: datetime) -> None:
db.query(CachedProduct).filter(
CachedProduct.user_id == user_id,
CachedProduct.evotor_id == evo_id,
).update({"synced_at": now})
db.commit()
async def sync_user(
user_id: int,
evo_token: str,
vk_token: str,
vk_group_id: str,
filters: list,
photo_path: str,
db: Session,
) -> None:
owner_id = f"-{vk_group_id}"
now = datetime.utcnow()
logger.info("Sync start: user_id=%d vk_group=%s", user_id, vk_group_id)
store_ids = _get_included_store_ids(filters)
if not store_ids:
logger.info("Sync skip: user_id=%d — no stores included in filters", user_id)
return
# Collect all Evotor products and groups across included stores
evo_products: list[dict] = []
groups_by_id: dict[str, dict] = {}
for store_id in store_ids:
raw_groups = await _evo_fetch_groups(evo_token, store_id)
for g in raw_groups:
gid = g.get("uuid") or g.get("id")
if gid:
groups_by_id[gid] = g
raw_products = await _evo_fetch_products(evo_token, store_id)
for p in raw_products:
pid = p.get("uuid") or p.get("id")
gid = p.get("parentUuid") or p.get("parent_id")
if not _is_group_included(gid, filters):
continue
if not _is_product_included(pid, filters):
continue
evo_products.append(p)
# Build evo product lookup by normalized name
# {normalized_name: product_dict}
evo_by_name: dict[str, dict] = {}
for p in evo_products:
raw_name = (p.get("name") or "").strip()
norm = _normalize_name(raw_name)
evo_by_name[norm] = p
# Fetch VK state
vk_products = await _vk_get_products(vk_token, owner_id)
vk_albums = await _vk_get_albums(vk_token, owner_id)
vk_album_by_title: dict[str, dict] = {a["title"]: a for a in vk_albums}
# Ensure albums exist for all included groups
for gid, group in groups_by_id.items():
if not _is_group_included(gid, filters):
continue
title = group.get("name", "")
if title and title not in vk_album_by_title:
new_album_id = await _vk_create_album(vk_token, owner_id, title)
if new_album_id:
vk_album_by_title[title] = {"id": new_album_id, "title": title}
logger.info("Created VK album '%s' for user_id=%d", title, user_id)
# Build VK product lookup by normalized name
# {normalized_name: [vk_item, ...]}
vk_by_name: dict[str, list[dict]] = {}
for item in vk_products:
norm = _normalize_name(item.get("title", ""))
vk_by_name.setdefault(norm, []).append(item)
# --- UPDATE / CREATE ---
for norm_name, evo_p in evo_by_name.items():
evo_id = evo_p.get("uuid") or evo_p.get("id")
raw_name = (evo_p.get("name") or "").strip()
name_for_vk = _normalize_name(raw_name)
measure = evo_p.get("measureName") or evo_p.get("measure_name")
raw_price = evo_p.get("price") or 0
price, price_info = _calc_price(raw_price, measure)
allow_to_sell = evo_p.get("allowToSell") if evo_p.get("allowToSell") is not None else evo_p.get("allow_to_sell")
stock_amount = VK_STOCK_AMOUNT if allow_to_sell else 0
extra_desc = evo_p.get("description") or ""
description = _build_description(raw_name, price_info, extra_desc).strip()
gid = evo_p.get("parentUuid") or evo_p.get("parent_id")
group_name = groups_by_id.get(gid, {}).get("name") if gid else None
album = vk_album_by_title.get(group_name) if group_name else None
album_id = album["id"] if album else None
if norm_name in vk_by_name:
# Update existing (use first match)
vk_item = vk_by_name[norm_name][0]
vk_id = vk_item["id"]
orig_price = vk_item.get("price", {}).get("amount", 0)
orig_price_int = int(orig_price) if orig_price else 0
orig_desc = (vk_item.get("description") or "").strip()
orig_stock = vk_item.get("stock_amount", 0)
price_changed = price != orig_price_int
desc_changed = description != orig_desc
stock_changed = stock_amount != orig_stock
if price_changed or desc_changed or stock_changed:
logger.info(
"Updating VK product '%s' user_id=%d (price=%s desc=%s stock=%s)",
name_for_vk, user_id, price_changed, desc_changed, stock_changed,
)
await _vk_edit_product(
vk_token, owner_id, vk_id, name_for_vk, description, price, stock_amount,
)
_stamp_synced(db, user_id, evo_id, now)
else:
# Create new (only if allow_to_sell)
if not allow_to_sell:
continue
photo_id = await _vk_upload_photo(vk_token, vk_group_id, photo_path)
if not photo_id:
logger.error("Skipping product '%s' — photo upload failed", name_for_vk)
continue
logger.info("Creating VK product '%s' user_id=%d", name_for_vk, user_id)
created = await _vk_create_product(
vk_token, owner_id, name_for_vk, description,
price, stock_amount, photo_id, album_id,
)
if created:
_stamp_synced(db, user_id, evo_id, now)
# --- DELETE products in VK that are no longer in Evo ---
for norm_name, vk_items in vk_by_name.items():
if norm_name in evo_by_name:
# Delete duplicates (keep first)
for dup in vk_items[1:]:
logger.info("Deleting duplicate VK product '%s' id=%d user_id=%d",
norm_name, dup["id"], user_id)
await _vk_delete_product(vk_token, owner_id, dup["id"])
else:
# Delete all — product removed from Evo
for item in vk_items:
logger.info("Deleting removed product '%s' id=%d user_id=%d",
norm_name, item["id"], user_id)
await _vk_delete_product(vk_token, owner_id, item["id"])
logger.info("Sync complete: user_id=%d", user_id)
# ---------------------------------------------------------------------------
# Background loop
# ---------------------------------------------------------------------------
async def run_sync() -> None:
from web.config import settings
db = SessionLocal()
try:
configs = db.query(SyncConfig).filter(
SyncConfig.is_enabled == True,
SyncConfig.confirmed_at != None,
).all()
for config in configs:
user_id = config.user_id
evo = db.query(EvotorConnection).filter(
EvotorConnection.user_id == user_id
).first()
vk = db.query(VkConnection).filter(
VkConnection.user_id == user_id
).first()
if not evo or not vk:
continue
if not evo.access_token or not vk.access_token:
continue
if not vk.vk_user_id:
continue
try:
await sync_user(
user_id=user_id,
evo_token=evo.access_token,
vk_token=vk.access_token,
vk_group_id=vk.vk_user_id,
filters=config.filters,
photo_path=settings.VK_DEFAULT_PHOTO_PATH,
db=db,
)
except Exception:
logger.exception("Sync failed for user_id=%d", user_id)
except Exception:
logger.exception("Error in sync runner")
db.rollback()
finally:
db.close()
async def sync_loop(interval: int) -> None:
while True:
await run_sync()
await asyncio.sleep(interval)

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}EvoSync{% endblock %}</title>
<title>{% block title %}ЭВОСИНК{% endblock %}</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
<link rel="stylesheet" href="/static/style.css">
@@ -11,7 +11,7 @@
<body>
<nav class="navbar navbar-expand-lg bg-white border-bottom border-2 brand-border">
<div class="container">
<a href="/" class="navbar-brand brand-logo">EvoSync</a>
<a href="/" class="navbar-brand brand-logo">ЭВОСИНК</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
<span class="navbar-toggler-icon"></span>
</button>
@@ -64,6 +64,9 @@
{% block content %}{% endblock %}
</main>
{% if jivosite_widget_id %}
<script src="//code.jivosite.com/widget/{{ jivosite_widget_id }}" async></script>
{% endif %}
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/inputmask@5.0.9/dist/inputmask.min.js"></script>
<script>

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Группы — {{ store.name }} — EvoSync{% endblock %}
{% block title %}Группы — {{ store.name }} — ЭВОСИНК{% endblock %}
{% block content %}
<nav aria-label="breadcrumb" class="mb-3">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Товары — EvoSync{% endblock %}
{% block title %}Товары — ЭВОСИНК{% endblock %}
{% block content %}
<nav aria-label="breadcrumb" class="mb-3">
@@ -30,7 +30,7 @@
<p>Товары не найдены.</p>
</div>
{% else %}
<div class="table-responsive">
<div class="table-responsive" style="overflow: visible;">
<table class="table table-striped table-hover align-middle small">
<thead class="table-light">
<tr>
@@ -40,6 +40,7 @@
<th>Кол-во</th>
<th>Ед. изм.</th>
<th>В продаже</th>
<th>Синхронизирован</th>
<th>Фильтр</th>
<th></th>
</tr>
@@ -62,6 +63,15 @@
<i class="bi bi-x-circle-fill text-danger"></i>
{% endif %}
</td>
<td>
{% if product.synced_at %}
<span title="{{ product.synced_at.strftime('%d.%m.%Y %H:%M') }}">
<i class="bi bi-check-circle-fill text-success"></i>
</span>
{% else %}
<span class="text-muted"></span>
{% endif %}
</td>
<td>
{% if mode == "include" %}
<span class="badge bg-success">✓ Включено</span>
@@ -73,7 +83,7 @@
</td>
<td>
<div class="dropdown">
<button class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
<button class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" data-bs-strategy="fixed">
<i class="bi bi-funnel"></i>
</button>
<ul class="dropdown-menu dropdown-menu-end">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Каталог — EvoSync{% endblock %}
{% block title %}Каталог — ЭВОСИНК{% endblock %}
{% block content %}
<div class="d-flex align-items-center justify-content-between mb-3">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Подтверждение email — EvoSync{% endblock %}
{% block title %}Подтверждение email — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Подключения — EvoSync{% endblock %}
{% block title %}Подключения — ЭВОСИНК{% endblock %}
{% block content %}
<div class="d-flex align-items-center justify-content-between mb-4">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Добавить подключение — EvoSync{% endblock %}
{% block title %}Добавить подключение — ЭВОСИНК{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Email подтвержден — EvoSync{% endblock %}
{% block title %}Email подтвержден — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Подключение Эвотор — EvoSync{% endblock %}
{% block title %}Подключение Эвотор — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">
@@ -7,12 +7,10 @@
{% if error %}
<div class="alert alert-danger mt-4">
{% if error == "invalid_state" %}
<i class="bi bi-exclamation-triangle me-2"></i>Ошибка безопасности. Попробуйте подключить аккаунт заново.
{% elif error == "token_exchange" %}
<i class="bi bi-exclamation-triangle me-2"></i>Не удалось получить токен доступа от Эвотор. Попробуйте позже.
{% elif error == "no_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Эвотор не вернул токен доступа. Попробуйте позже.
{% if error == "invalid_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Токен недействителен. Проверьте правильность и попробуйте снова.
{% elif error == "empty_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Введите токен.
{% else %}
<i class="bi bi-exclamation-triangle me-2"></i>Произошла ошибка при подключении: {{ error }}
{% endif %}
@@ -48,8 +46,16 @@
<span class="small">{{ connection.connected_at.strftime("%d.%m.%Y %H:%M") }}</span>
</li>
</ul>
<div class="card-body d-grid gap-2">
<a href="/evotor/connect" class="btn btn-primary">Переподключить</a>
<div class="card-footer">
<p class="text-muted small mb-2">Обновить токен (Личный кабинет Эвотор → <strong>Приложения → ЭвоСинк → Настройки</strong>):</p>
<form method="post" action="/evotor/token">
<div class="input-group input-group-sm">
<input type="text" name="token" class="form-control font-monospace" placeholder="Новый токен" required>
<button type="submit" class="btn btn-outline-secondary">Обновить</button>
</div>
</form>
</div>
<div class="card-body d-grid">
<form method="post" action="/evotor/disconnect">
<button type="submit" class="btn btn-outline-danger w-100">Отключить аккаунт Эвотор</button>
</form>
@@ -59,17 +65,29 @@
{# ── NOT CONNECTED STATE ── #}
<div class="card-body">
<p class="text-muted mb-3">
Подключите ваш аккаунт Эвотор, чтобы система могла автоматически синхронизировать
каталог товаров из вашей кассы в ВКонтакте.
Для подключения вам нужно установить приложение <strong>ЭвоСинк</strong> в личном кабинете Эвотор
и скопировать токен доступа из его настроек.
</p>
<ul class="text-muted small mb-4">
<li>Вы будете перенаправлены на сайт Эвотор для авторизации</li>
<li>После подтверждения доступа синхронизация будет настроена автоматически</li>
<li>Вы можете отключить доступ в любой момент</li>
</ul>
<div class="d-grid">
<a href="/evotor/connect" class="btn btn-primary btn-lg">Подключить Эвотор</a>
<ol class="text-muted small mb-4">
{% if app_url %}
<li class="mb-1">Откройте <a href="{{ app_url }}" target="_blank" rel="noopener">приложение ЭвоСинк в магазине Эвотор <i class="bi bi-box-arrow-up-right small"></i></a> и установите его.</li>
{% else %}
<li class="mb-1">Найдите приложение <strong>ЭвоСинк</strong> в магазине Эвотор и установите его.</li>
{% endif %}
<li class="mb-1">Перейдите в раздел <strong>Приложения → ЭвоСинк → Настройки</strong>.</li>
<li class="mb-1">Скопируйте токен доступа и вставьте его в поле ниже.</li>
</ol>
<form method="post" action="/evotor/token">
<div class="mb-3">
<label class="form-label small text-muted">Токен доступа</label>
<input type="text" name="token" class="form-control font-monospace" placeholder="Вставьте токен Эвотор" required autofocus>
</div>
<div class="d-grid">
<button type="submit" class="btn btn-primary">Подключить</button>
</div>
</form>
</div>
{% endif %}

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Забыли пароль — EvoSync{% endblock %}
{% block title %}Забыли пароль — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Вход — EvoSync{% endblock %}
{% block title %}Вход — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}{{ title }} — EvoSync{% endblock %}
{% block title %}{{ title }} — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Изменить пароль — EvoSync{% endblock %}
{% block title %}Изменить пароль — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Удалить аккаунт — EvoSync{% endblock %}
{% block title %}Удалить аккаунт — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Редактировать профиль — EvoSync{% endblock %}
{% block title %}Редактировать профиль — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Личный кабинет — EvoSync{% endblock %}
{% block title %}Личный кабинет — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Регистрация — EvoSync{% endblock %}
{% block title %}Регистрация — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Новый пароль — EvoSync{% endblock %}
{% block title %}Новый пароль — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block title %}Синхронизация — EvoSync{% endblock %}
{% block title %}Синхронизация — ЭВОСИНК{% endblock %}
{% block content %}
<h1 class="h4 mb-4">Синхронизация</h1>

View File

@@ -0,0 +1,109 @@
{% extends "base.html" %}
{% block title %}Подключение ВКонтакте — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">
<div class="col-sm-10 col-md-7 col-lg-6">
{% if error %}
<div class="alert alert-danger mt-4">
{% if error == "invalid_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Токен недействителен или у него нет прав администратора сообщества.
{% elif error == "empty_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Введите токен.
{% elif error == "no_client_id" %}
<i class="bi bi-exclamation-triangle me-2"></i>Автоматическое подключение не настроено. Введите токен вручную.
{% else %}
<i class="bi bi-exclamation-triangle me-2"></i>Произошла ошибка при подключении: {{ error }}
{% endif %}
</div>
{% endif %}
<div class="card shadow-sm mt-4">
<div class="card-header">
<h1 class="h5 mb-0">Подключение ВКонтакте</h1>
</div>
{% if connection %}
{# ── CONNECTED STATE ── #}
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted small">Статус</span>
<span class="badge bg-success"><i class="bi bi-check-circle me-1"></i>Подключено</span>
</li>
{% if connection.first_name %}
<li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted small">Сообщество</span>
<span>{{ connection.first_name }}</span>
</li>
{% endif %}
{% if connection.vk_user_id %}
<li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted small">ID сообщества</span>
<span class="font-monospace small text-muted">{{ connection.vk_user_id }}</span>
</li>
{% endif %}
<li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted small">Подключено</span>
<span class="small">{{ connection.connected_at.strftime("%d.%m.%Y %H:%M") }}</span>
</li>
</ul>
<div class="card-footer">
<p class="text-muted small mb-2">Обновить токен пользователя:</p>
<form method="post" action="/vk/token">
<div class="input-group input-group-sm">
<input type="text" name="token" class="form-control font-monospace" placeholder="Новый токен пользователя" required>
<button type="submit" class="btn btn-outline-secondary">Обновить</button>
</div>
</form>
</div>
<div class="card-body d-grid">
<form method="post" action="/vk/disconnect">
<button type="submit" class="btn btn-outline-danger w-100">Отключить ВКонтакте</button>
</form>
</div>
{% else %}
{# ── NOT CONNECTED STATE ── #}
<div class="card-body">
{% if vk_client_id %}
<p class="text-muted mb-4">
Нажмите кнопку ниже, чтобы авторизоваться через ВКонтакте и выдать доступ к управлению товарами вашего сообщества.
</p>
<div class="d-grid mb-3">
<a href="/vk/connect" class="btn btn-primary btn-lg">
<i class="bi bi-box-arrow-in-right me-2"></i>Подключить ВКонтакте
</a>
</div>
<hr class="my-4">
<p class="text-muted small mb-2">Или введите токен вручную:</p>
{% else %}
<p class="text-muted mb-3">
Для синхронизации товаров необходим <strong>токен пользователя</strong> ВКонтакте
с правами на управление товарами сообщества.
</p>
{% endif %}
<form method="post" action="/vk/token">
<div class="mb-3">
<label class="form-label small text-muted">Токен пользователя ВКонтакте</label>
<input type="text" name="token" class="form-control font-monospace" placeholder="Вставьте токен пользователя" required {% if vk_client_id %}{% else %}autofocus{% endif %}>
</div>
<div class="d-grid">
<button type="submit" class="btn {% if vk_client_id %}btn-outline-secondary{% else %}btn-primary{% endif %}">Подключить</button>
</div>
</form>
</div>
{% endif %}
</div>
<div class="mt-3 text-center">
<a href="/connections" class="text-muted small">
<i class="bi bi-arrow-left me-1"></i>Вернуться к подключениям
</a>
</div>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,47 @@
{% extends "base.html" %}
{% block title %}Подключение ВКонтакте — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-content-center">
<div class="col-sm-10 col-md-7 col-lg-6">
<div class="card shadow-sm mt-4 text-center">
<div class="card-body py-5">
<div id="state-loading">
<div class="spinner-border text-primary mb-3" role="status"></div>
<p class="text-muted mb-0">Подключение ВКонтакте…</p>
</div>
<div id="state-error" class="d-none">
<i class="bi bi-exclamation-triangle-fill text-danger fs-1 mb-3 d-block"></i>
<p class="text-muted mb-3" id="error-message">Не удалось получить токен от ВКонтакте.</p>
<a href="/vk" class="btn btn-outline-secondary">Попробовать снова</a>
</div>
</div>
</div>
</div>
</div>
<form id="token-form" method="post" action="/vk/token" class="d-none">
<input type="hidden" name="token" id="token-input">
</form>
<script>
(function () {
var hash = window.location.hash.slice(1);
var params = {};
hash.split("&").forEach(function (part) {
var kv = part.split("=");
params[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1] || "");
});
if (params.access_token) {
document.getElementById("token-input").value = params.access_token;
document.getElementById("token-form").submit();
} else {
var msg = params.error_description || params.error || "Авторизация отклонена.";
document.getElementById("error-message").textContent = msg;
document.getElementById("state-loading").classList.add("d-none");
document.getElementById("state-error").classList.remove("d-none");
}
})();
</script>
{% endblock %}

View File

@@ -0,0 +1,6 @@
from fastapi.templating import Jinja2Templates
from web.config import settings
templates = Jinja2Templates(directory="web/templates")
templates.env.globals["jivosite_widget_id"] = settings.JIVOSITE_WIDGET_ID

2
web/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
node_modules/
dist/

10
web/drizzle.config.ts Normal file
View File

@@ -0,0 +1,10 @@
import { defineConfig } from "drizzle-kit";
export default defineConfig({
schema: "./src/db/schema.ts",
out: "./drizzle",
dialect: "mysql",
dbCredentials: {
url: process.env.DATABASE_URL ?? "mysql://evosync:evosync@localhost:3306/evosync",
},
});

2001
web/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

28
web/package.json Normal file
View File

@@ -0,0 +1,28 @@
{
"name": "evosync-web",
"version": "1.0.0",
"private": true,
"type": "module",
"scripts": {
"dev": "tsx watch src/index.ts",
"build": "tsc",
"start": "node dist/index.js"
},
"dependencies": {
"@hono/node-server": "^1.13.7",
"bcryptjs": "^2.4.3",
"drizzle-orm": "^0.41.0",
"hono": "^4.7.4",
"hono-sessions": "^0.5.5",
"mysql2": "^3.14.0",
"nunjucks": "^3.2.4"
},
"devDependencies": {
"@types/bcryptjs": "^2.4.6",
"@types/node": "^22.13.13",
"@types/nunjucks": "^3.2.6",
"drizzle-kit": "^0.30.4",
"tsx": "^4.19.3",
"typescript": "^5.8.2"
}
}

View File

@@ -1,175 +0,0 @@
import secrets
import logging
import httpx
from fastapi import APIRouter, Request, Depends
logger = logging.getLogger(__name__)
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy.orm import Session
from web.auth import get_current_user
from web.config import settings
from web.database import get_db
from web.models import User, EvotorConnection
router = APIRouter(prefix="/evotor")
templates = Jinja2Templates(directory="web/templates")
EVOTOR_AUTHORIZE_URL = "https://oauth.evotor.ru/oauth/authorize"
EVOTOR_TOKEN_URL = "https://oauth.evotor.ru/oauth/token"
EVOTOR_STORES_URL = "https://api.evotor.ru/stores"
def _redirect_uri() -> str:
return f"{settings.BASE_URL}/evotor/callback"
@router.get("")
def evotor_page(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(EvotorConnection).filter(EvotorConnection.user_id == user.id).first()
error = request.query_params.get("error")
return templates.TemplateResponse("evotor.html", {
"request": request,
"user": user,
"connection": connection,
"error": error,
})
@router.get("/connect")
def evotor_connect(request: Request, user: User | None = Depends(get_current_user)):
if not user:
return RedirectResponse("/login", 303)
state = secrets.token_urlsafe(32)
request.session["evotor_oauth_state"] = state
params = (
f"?client_id={settings.EVOTOR_CLIENT_ID}"
f"&response_type=code"
f"&redirect_uri={_redirect_uri()}"
f"&scope={settings.EVOTOR_SCOPES.replace(' ', '%20')}"
f"&state={state}"
)
return RedirectResponse(EVOTOR_AUTHORIZE_URL + params, 302)
@router.get("/callback")
async def evotor_callback(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
code = request.query_params.get("code")
state = request.query_params.get("state")
saved_state = request.session.pop("evotor_oauth_state", None)
if not code or not state or state != saved_state:
return RedirectResponse("/evotor?error=invalid_state", 303)
# Exchange code for access token
try:
async with httpx.AsyncClient() as client:
token_response = await client.post(
EVOTOR_TOKEN_URL,
data={
"grant_type": "authorization_code",
"code": code,
"redirect_uri": _redirect_uri(),
"client_id": settings.EVOTOR_CLIENT_ID,
"client_secret": settings.EVOTOR_CLIENT_SECRET,
},
timeout=15,
)
token_response.raise_for_status()
token_data = token_response.json()
except httpx.HTTPStatusError as e:
logger.error("Evotor token exchange HTTP error %s: %s", e.response.status_code, e.response.text)
return RedirectResponse("/evotor?error=token_exchange", 303)
except Exception as e:
logger.error("Evotor token exchange failed: %s", e, exc_info=True)
return RedirectResponse("/evotor?error=token_exchange", 303)
access_token = token_data.get("access_token")
refresh_token = token_data.get("refresh_token")
expires_in = token_data.get("expires_in")
if not access_token:
return RedirectResponse("/evotor?error=no_token", 303)
# Fetch first store to save store info
store_id = None
store_name = None
try:
async with httpx.AsyncClient() as client:
stores_response = await client.get(
EVOTOR_STORES_URL,
headers={"Authorization": f"Bearer {access_token}"},
timeout=15,
)
if stores_response.status_code == 200:
stores = stores_response.json()
items = stores.get("items", stores) if isinstance(stores, dict) else stores
if items:
store_id = items[0].get("uuid") or items[0].get("id")
store_name = items[0].get("name")
except Exception:
pass # Store info is optional; token is still saved
# Save or update connection
from datetime import datetime, timedelta
now = datetime.utcnow()
token_expires_at = now + timedelta(seconds=expires_in) if expires_in else None
connection = db.query(EvotorConnection).filter(EvotorConnection.user_id == user.id).first()
if connection:
connection.access_token = access_token
connection.refresh_token = refresh_token
connection.token_expires_at = token_expires_at
connection.store_id = store_id
connection.store_name = store_name
connection.is_online = True
connection.last_checked_at = now
else:
connection = EvotorConnection(
user_id=user.id,
access_token=access_token,
refresh_token=refresh_token,
token_expires_at=token_expires_at,
store_id=store_id,
store_name=store_name,
is_online=True,
last_checked_at=now,
)
db.add(connection)
db.commit()
return RedirectResponse("/connections", 303)
@router.post("/disconnect")
async def evotor_disconnect(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(EvotorConnection).filter(EvotorConnection.user_id == user.id).first()
if connection:
db.delete(connection)
db.commit()
return RedirectResponse("/connections", 303)

View File

@@ -1,164 +0,0 @@
import secrets
from datetime import datetime
import httpx
from fastapi import APIRouter, Request, Depends
from fastapi.responses import RedirectResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy.orm import Session
from web.auth import get_current_user
from web.config import settings
from web.database import get_db
from web.models import User, VkConnection
router = APIRouter(prefix="/vk")
templates = Jinja2Templates(directory="web/templates")
VK_AUTHORIZE_URL = "https://oauth.vk.com/authorize"
VK_TOKEN_URL = "https://oauth.vk.com/access_token"
VK_API_URL = "https://api.vk.com/method"
def _redirect_uri() -> str:
return f"{settings.BASE_URL}/vk/callback"
@router.get("")
def vk_page(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(VkConnection).filter(VkConnection.user_id == user.id).first()
error = request.query_params.get("error")
return templates.TemplateResponse("vk.html", {
"request": request,
"user": user,
"connection": connection,
"error": error,
})
@router.get("/connect")
def vk_connect(request: Request, user: User | None = Depends(get_current_user)):
if not user:
return RedirectResponse("/login", 303)
state = secrets.token_urlsafe(32)
request.session["vk_oauth_state"] = state
params = (
f"?client_id={settings.VK_CLIENT_ID}"
f"&response_type=code"
f"&redirect_uri={_redirect_uri()}"
f"&scope={settings.VK_SCOPES.replace(' ', '%20')}"
f"&state={state}"
f"&display=page"
f"&v={settings.VK_API_VERSION}"
)
return RedirectResponse(VK_AUTHORIZE_URL + params, 302)
@router.get("/callback")
async def vk_callback(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
code = request.query_params.get("code")
state = request.query_params.get("state")
saved_state = request.session.pop("vk_oauth_state", None)
if not code or not state or state != saved_state:
return RedirectResponse("/vk?error=invalid_state", 303)
# Exchange code for token (VK uses GET with query params)
try:
async with httpx.AsyncClient() as client:
token_response = await client.get(
VK_TOKEN_URL,
params={
"client_id": settings.VK_CLIENT_ID,
"client_secret": settings.VK_CLIENT_SECRET,
"code": code,
"redirect_uri": _redirect_uri(),
},
timeout=15,
)
token_response.raise_for_status()
token_data = token_response.json()
except Exception:
return RedirectResponse("/vk?error=token_exchange", 303)
access_token = token_data.get("access_token")
vk_user_id = str(token_data.get("user_id", "")) or None
if not access_token:
return RedirectResponse("/vk?error=no_token", 303)
# Fetch VK profile info
first_name = None
last_name = None
try:
async with httpx.AsyncClient() as client:
profile_response = await client.get(
f"{VK_API_URL}/users.get",
params={"access_token": access_token, "v": settings.VK_API_VERSION},
timeout=15,
)
if profile_response.status_code == 200:
profile_data = profile_response.json()
items = profile_data.get("response", [])
if items:
first_name = items[0].get("first_name")
last_name = items[0].get("last_name")
except Exception:
pass
# Save or update connection
connection = db.query(VkConnection).filter(VkConnection.user_id == user.id).first()
if connection:
connection.access_token = access_token
connection.vk_user_id = vk_user_id
connection.first_name = first_name
connection.last_name = last_name
connection.is_online = True
connection.last_checked_at = datetime.utcnow()
else:
connection = VkConnection(
user_id=user.id,
access_token=access_token,
vk_user_id=vk_user_id,
first_name=first_name,
last_name=last_name,
is_online=True,
last_checked_at=datetime.utcnow(),
)
db.add(connection)
db.commit()
return RedirectResponse("/connections", 303)
@router.post("/disconnect")
async def vk_disconnect(
request: Request,
db: Session = Depends(get_db),
user: User | None = Depends(get_current_user),
):
if not user:
return RedirectResponse("/login", 303)
connection = db.query(VkConnection).filter(VkConnection.user_id == user.id).first()
if connection:
db.delete(connection)
db.commit()
return RedirectResponse("/connections", 303)

22
web/src/config.ts Normal file
View File

@@ -0,0 +1,22 @@
export const config = {
DATABASE_URL: process.env.DATABASE_URL ?? "mysql://evosync:evosync@localhost:3306/evosync",
SECRET_KEY: process.env.SECRET_KEY ?? "change-me-in-production",
BASE_URL: process.env.BASE_URL ?? "http://localhost:8080",
PORT: parseInt(process.env.PORT ?? "3000", 10),
PASSWORD_RESET_EXPIRE_MINUTES: parseInt(process.env.PASSWORD_RESET_EXPIRE_MINUTES ?? "60", 10),
EVOTOR_APP_ID: process.env.EVOTOR_APP_ID ?? "",
EVOTOR_WEBHOOK_SECRET: process.env.EVOTOR_WEBHOOK_SECRET ?? "",
JIVOSITE_WIDGET_ID: process.env.JIVOSITE_WIDGET_ID ?? "",
HEALTH_CHECK_INTERVAL_SECONDS: parseInt(process.env.HEALTH_CHECK_INTERVAL_SECONDS ?? "600", 10),
CATALOG_REFRESH_INTERVAL_SECONDS: parseInt(process.env.CATALOG_REFRESH_INTERVAL_SECONDS ?? "3600", 10),
SYNC_INTERVAL_SECONDS: parseInt(process.env.SYNC_INTERVAL_SECONDS ?? "3600", 10),
VK_DEFAULT_PHOTO_PATH: process.env.VK_DEFAULT_PHOTO_PATH ?? "/app/default_product.png",
VK_CLIENT_ID: process.env.VK_CLIENT_ID ?? "",
VK_CLIENT_SECRET: process.env.VK_CLIENT_SECRET ?? "",
VK_API_VERSION: process.env.VK_API_VERSION ?? "5.131",
} as const;

13
web/src/db/client.ts Normal file
View File

@@ -0,0 +1,13 @@
import { drizzle } from "drizzle-orm/mysql2";
import mysql from "mysql2/promise";
import { config } from "../config.js";
import * as schema from "./schema.js";
const pool = mysql.createPool({
uri: config.DATABASE_URL,
waitForConnections: true,
connectionLimit: 10,
decimalNumbers: true,
});
export const db = drizzle(pool, { schema, mode: "default" });

140
web/src/db/schema.ts Normal file
View File

@@ -0,0 +1,140 @@
import {
mysqlTable,
int,
varchar,
text,
boolean,
datetime,
decimal,
uniqueIndex,
index,
} from "drizzle-orm/mysql-core";
import { sql } from "drizzle-orm";
export const users = mysqlTable("users", {
id: int("id").autoincrement().primaryKey(),
first_name: varchar("first_name", { length: 100 }).notNull(),
last_name: varchar("last_name", { length: 100 }).notNull(),
email: varchar("email", { length: 255 }).notNull(),
phone: varchar("phone", { length: 20 }).notNull(),
password_hash: varchar("password_hash", { length: 255 }).notNull(),
is_email_confirmed: boolean("is_email_confirmed").notNull().default(false),
email_confirm_token: varchar("email_confirm_token", { length: 255 }),
password_reset_token: varchar("password_reset_token", { length: 255 }),
password_reset_expires: datetime("password_reset_expires"),
created_at: datetime("created_at").notNull().default(sql`CURRENT_TIMESTAMP`),
updated_at: datetime("updated_at").notNull().default(sql`CURRENT_TIMESTAMP`),
}, (t) => [
uniqueIndex("ix_users_email").on(t.email),
uniqueIndex("ix_users_phone").on(t.phone),
]);
export const evotor_connections = mysqlTable("evotor_connections", {
id: int("id").autoincrement().primaryKey(),
user_id: int("user_id").references(() => users.id, { onDelete: "cascade" }),
evotor_user_id: varchar("evotor_user_id", { length: 255 }),
access_token: text("access_token").notNull(),
store_id: varchar("store_id", { length: 255 }),
store_name: varchar("store_name", { length: 255 }),
refresh_token: text("refresh_token"),
token_expires_at: datetime("token_expires_at"),
is_online: boolean("is_online").notNull().default(false),
last_checked_at: datetime("last_checked_at"),
connected_at: datetime("connected_at").notNull().default(sql`CURRENT_TIMESTAMP`),
updated_at: datetime("updated_at").notNull().default(sql`CURRENT_TIMESTAMP`),
}, (t) => [
uniqueIndex("ix_evotor_connections_user_id").on(t.user_id),
uniqueIndex("ix_evotor_connections_evotor_user_id").on(t.evotor_user_id),
]);
export const vk_connections = mysqlTable("vk_connections", {
id: int("id").autoincrement().primaryKey(),
user_id: int("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
access_token: text("access_token").notNull(),
vk_user_id: varchar("vk_user_id", { length: 50 }),
first_name: varchar("first_name", { length: 255 }),
last_name: varchar("last_name", { length: 255 }),
is_online: boolean("is_online").notNull().default(false),
last_checked_at: datetime("last_checked_at"),
connected_at: datetime("connected_at").notNull().default(sql`CURRENT_TIMESTAMP`),
updated_at: datetime("updated_at").notNull().default(sql`CURRENT_TIMESTAMP`),
}, (t) => [
uniqueIndex("ix_vk_connections_user_id").on(t.user_id),
]);
export const sync_configs = mysqlTable("sync_configs", {
id: int("id").autoincrement().primaryKey(),
user_id: int("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
is_enabled: boolean("is_enabled").notNull().default(false),
confirmed_at: datetime("confirmed_at"),
created_at: datetime("created_at").notNull().default(sql`CURRENT_TIMESTAMP`),
updated_at: datetime("updated_at").notNull().default(sql`CURRENT_TIMESTAMP`),
}, (t) => [
uniqueIndex("ix_sync_configs_user_id").on(t.user_id),
]);
export const sync_filters = mysqlTable("sync_filters", {
id: int("id").autoincrement().primaryKey(),
sync_config_id: int("sync_config_id").notNull().references(() => sync_configs.id, { onDelete: "cascade" }),
entity_type: varchar("entity_type", { length: 20 }).notNull(),
entity_id: varchar("entity_id", { length: 255 }).notNull(),
entity_name: varchar("entity_name", { length: 255 }),
filter_mode: varchar("filter_mode", { length: 10 }).notNull(),
parent_entity_id: varchar("parent_entity_id", { length: 255 }),
created_at: datetime("created_at").notNull().default(sql`CURRENT_TIMESTAMP`),
}, (t) => [
uniqueIndex("uq_sync_filters_config_type_entity").on(t.sync_config_id, t.entity_type, t.entity_id),
]);
export const cached_stores = mysqlTable("cached_stores", {
id: int("id").autoincrement().primaryKey(),
user_id: int("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
evotor_id: varchar("evotor_id", { length: 255 }).notNull(),
name: varchar("name", { length: 255 }).notNull(),
address: varchar("address", { length: 500 }),
fetched_at: datetime("fetched_at").notNull(),
}, (t) => [
uniqueIndex("uq_cached_stores_user_evotor").on(t.user_id, t.evotor_id),
index("ix_cached_stores_user_id").on(t.user_id),
]);
export const cached_groups = mysqlTable("cached_groups", {
id: int("id").autoincrement().primaryKey(),
user_id: int("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
evotor_id: varchar("evotor_id", { length: 255 }).notNull(),
store_evotor_id: varchar("store_evotor_id", { length: 255 }).notNull(),
name: varchar("name", { length: 255 }).notNull(),
fetched_at: datetime("fetched_at").notNull(),
}, (t) => [
uniqueIndex("uq_cached_groups_user_evotor").on(t.user_id, t.evotor_id),
index("ix_cached_groups_user_store").on(t.user_id, t.store_evotor_id),
]);
export const cached_products = mysqlTable("cached_products", {
id: int("id").autoincrement().primaryKey(),
user_id: int("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
evotor_id: varchar("evotor_id", { length: 255 }).notNull(),
store_evotor_id: varchar("store_evotor_id", { length: 255 }).notNull(),
group_evotor_id: varchar("group_evotor_id", { length: 255 }),
name: varchar("name", { length: 255 }).notNull(),
price: decimal("price", { precision: 12, scale: 2 }),
quantity: decimal("quantity", { precision: 12, scale: 3 }),
measure_name: varchar("measure_name", { length: 20 }),
article_number: varchar("article_number", { length: 100 }),
allow_to_sell: boolean("allow_to_sell"),
fetched_at: datetime("fetched_at").notNull(),
synced_at: datetime("synced_at"),
}, (t) => [
uniqueIndex("uq_cached_products_user_evotor").on(t.user_id, t.evotor_id),
index("ix_cached_products_user_store_group").on(t.user_id, t.store_evotor_id, t.group_evotor_id),
]);
// Convenience types
export type User = typeof users.$inferSelect;
export type EvotorConnection = typeof evotor_connections.$inferSelect;
export type VkConnection = typeof vk_connections.$inferSelect;
export type SyncConfig = typeof sync_configs.$inferSelect;
export type SyncFilter = typeof sync_filters.$inferSelect;
export type CachedStore = typeof cached_stores.$inferSelect;
export type CachedGroup = typeof cached_groups.$inferSelect;
export type CachedProduct = typeof cached_products.$inferSelect;

71
web/src/index.ts Normal file
View File

@@ -0,0 +1,71 @@
import { serve } from "@hono/node-server";
import { serveStatic } from "@hono/node-server/serve-static";
import { Hono } from "hono";
import { sessionMiddleware, CookieStore } from "hono-sessions";
import path from "path";
import { fileURLToPath } from "url";
import { config } from "./config.js";
import { getSessionUserId, type AppEnv } from "./lib/auth.js";
import { db } from "./db/client.js";
import { users } from "./db/schema.js";
import { eq } from "drizzle-orm";
import { startHealthCheckLoop } from "./lib/healthChecker.js";
import { startSyncLoop } from "./lib/syncEngine.js";
import { authRouter } from "./routes/auth.js";
import { resetRouter } from "./routes/reset.js";
import { profileRouter } from "./routes/profile.js";
import { connectionsRouter } from "./routes/connections.js";
import { evotorRouter } from "./routes/evotor.js";
import { vkRouter } from "./routes/vk.js";
import { catalogRouter } from "./routes/catalog.js";
import { syncRouter } from "./routes/sync.js";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const app = new Hono<AppEnv>();
// Session middleware
const store = new CookieStore();
app.use("*", sessionMiddleware({
store,
encryptionKey: config.SECRET_KEY.padEnd(32, "0").slice(0, 32),
expireAfterSeconds: 86400 * 30,
cookieOptions: {
sameSite: "Lax",
path: "/",
httpOnly: true,
secure: process.env.NODE_ENV === "production",
},
sessionCookieName: "session",
}));
// Static files
app.use("/static/*", serveStatic({ root: path.join(__dirname, "../") }));
// Routes
app.route("/", authRouter);
app.route("/", resetRouter);
app.route("/", profileRouter);
app.route("/", connectionsRouter);
app.route("/", evotorRouter);
app.route("/", vkRouter);
app.route("/", catalogRouter);
app.route("/", syncRouter);
// Home redirect
app.get("/", async (c) => {
const userId = getSessionUserId(c);
if (userId) {
const [user] = await db.select().from(users).where(eq(users.id, userId)).limit(1);
if (user) return c.redirect("/profile", 302);
}
return c.redirect("/login", 302);
});
serve({ fetch: app.fetch, port: config.PORT }, () => {
console.log(`Server running on port ${config.PORT}`);
startHealthCheckLoop(config.HEALTH_CHECK_INTERVAL_SECONDS * 1000);
startSyncLoop(config.SYNC_INTERVAL_SECONDS * 1000);
});

21
web/src/lib/auth.ts Normal file
View File

@@ -0,0 +1,21 @@
import bcrypt from "bcryptjs";
import type { Context } from "hono";
import type { Session } from "hono-sessions";
// Hono env type that includes our session variable
export type AppEnv = { Variables: { session: Session } };
export function hashPassword(password: string): Promise<string> {
return bcrypt.hash(password, 12);
}
export function verifyPassword(plain: string, hashed: string): Promise<boolean> {
return bcrypt.compare(plain, hashed);
}
export function getSessionUserId(c: Context<AppEnv>): number | null {
const session = c.get("session");
if (!session) return null;
const id = session.get("user_id");
return typeof id === "number" ? id : null;
}

106
web/src/lib/evotorApi.ts Normal file
View File

@@ -0,0 +1,106 @@
import { db } from "../db/client.js";
import { cached_stores, cached_groups, cached_products } from "../db/schema.js";
import { eq } from "drizzle-orm";
const EVOTOR_API_BASE = "https://api.evotor.ru";
async function fetchJson(url: string, token: string, allowStatuses: number[] = []): Promise<unknown> {
const resp = await fetch(url, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(15000),
});
if (allowStatuses.includes(resp.status)) return null;
if (!resp.ok) throw new Error(`Evotor API error ${resp.status}: ${url}`);
return resp.json();
}
export async function fetchStores(token: string): Promise<Array<{ id: string; name: string; address?: string }>> {
const data = await fetchJson(`${EVOTOR_API_BASE}/stores`, token) as unknown;
const items = (typeof data === "object" && data !== null && "items" in data)
? (data as { items: unknown[] }).items
: (Array.isArray(data) ? data : []);
return (items as Array<Record<string, unknown>>).map((s) => ({
id: (s.uuid as string) ?? (s.id as string),
name: (s.name as string) ?? "",
address: s.address as string | undefined,
}));
}
export async function fetchGroups(token: string, storeId: string): Promise<Array<{ id: string; name: string }>> {
const data = await fetchJson(`${EVOTOR_API_BASE}/stores/${storeId}/product-groups`, token, [402]);
if (!data) return [];
const items = (typeof data === "object" && data !== null && "items" in data)
? (data as { items: unknown[] }).items
: (Array.isArray(data) ? data : []);
return (items as Array<Record<string, unknown>>).map((g) => ({
id: (g.uuid as string) ?? (g.id as string),
name: (g.name as string) ?? "",
}));
}
export async function fetchProducts(token: string, storeId: string): Promise<Array<Record<string, unknown>>> {
const data = await fetchJson(`${EVOTOR_API_BASE}/stores/${storeId}/products`, token, [402]);
if (!data) return [];
const items = (typeof data === "object" && data !== null && "items" in data)
? (data as { items: unknown[] }).items
: (Array.isArray(data) ? data : []);
return (items as Array<Record<string, unknown>>).map((p) => ({
id: (p.uuid as string) ?? (p.id as string),
name: (p.name as string) ?? "",
parent_id: (p.parentUuid as string) ?? (p.parent_id as string) ?? null,
price: (p.price as number) ?? null,
quantity: (p.quantity as number) ?? null,
measure_name: (p.measureName as string) ?? (p.measure_name as string) ?? null,
article_number: (p.code as string) ?? (p.article_number as string) ?? null,
allow_to_sell: p.allowToSell !== undefined ? (p.allowToSell as boolean) : (p.allow_to_sell as boolean | null) ?? null,
}));
}
export async function refreshCatalogCache(userId: number, accessToken: string): Promise<void> {
const now = new Date();
await db.delete(cached_products).where(eq(cached_products.user_id, userId));
await db.delete(cached_groups).where(eq(cached_groups.user_id, userId));
await db.delete(cached_stores).where(eq(cached_stores.user_id, userId));
const stores = await fetchStores(accessToken);
for (const store of stores) {
await db.insert(cached_stores).values({
user_id: userId,
evotor_id: store.id,
name: store.name,
address: store.address ?? null,
fetched_at: now,
});
}
for (const store of stores) {
const groups = await fetchGroups(accessToken, store.id);
for (const group of groups) {
await db.insert(cached_groups).values({
user_id: userId,
evotor_id: group.id,
store_evotor_id: store.id,
name: group.name,
fetched_at: now,
});
}
const products = await fetchProducts(accessToken, store.id);
for (const product of products) {
await db.insert(cached_products).values({
user_id: userId,
evotor_id: product.id as string,
store_evotor_id: store.id,
group_evotor_id: (product.parent_id as string | null) ?? null,
name: product.name as string,
price: product.price !== null ? String(product.price) : null,
quantity: product.quantity !== null ? String(product.quantity) : null,
measure_name: (product.measure_name as string | null) ?? null,
article_number: (product.article_number as string | null) ?? null,
allow_to_sell: (product.allow_to_sell as boolean | null) ?? null,
fetched_at: now,
});
}
}
}

View File

@@ -0,0 +1,138 @@
import { db } from "../db/client.js";
import { evotor_connections, vk_connections, cached_stores } from "../db/schema.js";
import { eq } from "drizzle-orm";
import { refreshCatalogCache } from "./evotorApi.js";
import { config } from "../config.js";
const EVOTOR_STORES_URL = "https://api.evotor.ru/stores";
const EVOTOR_TOKEN_URL = "https://oauth.evotor.ru/oauth/token";
const VK_GROUPS_GET_URL = "https://api.vk.com/method/groups.getById";
const REFRESH_BEFORE_EXPIRY_MS = 2 * 60 * 60 * 1000; // 2 hours
async function checkEvotorConnection(token: string): Promise<boolean> {
try {
const resp = await fetch(EVOTOR_STORES_URL, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(15000),
});
return resp.ok;
} catch {
return false;
}
}
async function checkVkConnection(token: string): Promise<boolean> {
try {
const params = new URLSearchParams({ access_token: token, v: "5.131" });
const resp = await fetch(`${VK_GROUPS_GET_URL}?${params}`, { signal: AbortSignal.timeout(10000) });
if (!resp.ok) return false;
const data = await resp.json() as { error?: unknown };
return !data.error;
} catch {
return false;
}
}
async function refreshEvotorToken(conn: typeof evotor_connections.$inferSelect): Promise<{
access_token: string; refresh_token?: string; expires_in?: number;
} | null> {
if (!conn.refresh_token) return null;
try {
const body = new URLSearchParams({
grant_type: "refresh_token",
refresh_token: conn.refresh_token,
});
const resp = await fetch(EVOTOR_TOKEN_URL, {
method: "POST",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
body: body.toString(),
signal: AbortSignal.timeout(15000),
});
if (!resp.ok) return null;
const data = await resp.json() as { access_token?: string; refresh_token?: string; expires_in?: number };
return data.access_token ? data as { access_token: string; refresh_token?: string; expires_in?: number } : null;
} catch {
return null;
}
}
export async function runHealthChecks(): Promise<void> {
const now = new Date();
console.log("[health] running health checks");
try {
const evotorConns = await db.select().from(evotor_connections);
for (const conn of evotorConns) {
let token = conn.access_token;
// Proactive refresh if token expires soon
const needsRefresh = conn.refresh_token &&
conn.token_expires_at &&
conn.token_expires_at.getTime() - now.getTime() < REFRESH_BEFORE_EXPIRY_MS;
if (needsRefresh) {
const tokenData = await refreshEvotorToken(conn);
if (tokenData) {
token = tokenData.access_token;
const expires = tokenData.expires_in ? new Date(now.getTime() + tokenData.expires_in * 1000) : null;
await db.update(evotor_connections)
.set({ access_token: token, refresh_token: tokenData.refresh_token ?? conn.refresh_token, token_expires_at: expires })
.where(eq(evotor_connections.id, conn.id));
}
}
let isOnline = await checkEvotorConnection(token);
// If offline and not yet tried refresh, attempt it now
if (!isOnline && conn.refresh_token && !needsRefresh) {
const tokenData = await refreshEvotorToken(conn);
if (tokenData) {
token = tokenData.access_token;
const expires = tokenData.expires_in ? new Date(now.getTime() + tokenData.expires_in * 1000) : null;
await db.update(evotor_connections)
.set({ access_token: token, refresh_token: tokenData.refresh_token ?? conn.refresh_token, token_expires_at: expires })
.where(eq(evotor_connections.id, conn.id));
isOnline = await checkEvotorConnection(token);
}
}
await db.update(evotor_connections)
.set({ is_online: isOnline, last_checked_at: now })
.where(eq(evotor_connections.id, conn.id));
}
const vkConns = await db.select().from(vk_connections);
for (const conn of vkConns) {
const isOnline = await checkVkConnection(conn.access_token);
await db.update(vk_connections)
.set({ is_online: isOnline, last_checked_at: now })
.where(eq(vk_connections.id, conn.id));
}
// Refresh catalog cache for online Evotor connections
let refreshed = 0;
for (const conn of evotorConns) {
if (!conn.is_online || !conn.user_id) continue;
const [cached] = await db.select().from(cached_stores).where(eq(cached_stores.user_id, conn.user_id)).limit(1);
const ageSeconds = cached ? (now.getTime() - cached.fetched_at.getTime()) / 1000 : Infinity;
if (!cached || ageSeconds >= config.CATALOG_REFRESH_INTERVAL_SECONDS) {
try {
await refreshCatalogCache(conn.user_id, conn.access_token);
refreshed++;
} catch (err) {
console.error(`[health] catalog refresh failed for user_id=${conn.user_id}:`, err);
}
}
}
console.log(`[health] done: ${evotorConns.length} evotor, ${vkConns.length} vk, ${refreshed} catalogs refreshed`);
} catch (err) {
console.error("[health] error:", err);
}
}
export function startHealthCheckLoop(intervalMs: number): NodeJS.Timeout {
return setInterval(() => {
runHealthChecks().catch((err) => console.error("[health] uncaught error:", err));
}, intervalMs);
}

39
web/src/lib/render.ts Normal file
View File

@@ -0,0 +1,39 @@
import nunjucks from "nunjucks";
import path from "path";
import { config } from "../config.js";
// In dev (tsx): templates are in src/templates/
// In prod (node dist/): Dockerfile copies src/templates/ to dist/templates/
const isDev = process.env.NODE_ENV !== "production";
const templatesDir = isDev
? path.join(process.cwd(), "src", "templates")
: path.join(process.cwd(), "dist", "templates");
const env = nunjucks.configure(templatesDir, {
autoescape: true,
noCache: process.env.NODE_ENV !== "production",
});
env.addGlobal("jivosite_widget_id", config.JIVOSITE_WIDGET_ID);
// Format a JS Date to Russian date string
env.addFilter("datefmt", (d: Date | null | undefined, fmt?: string) => {
if (!d) return "";
const dd = String(d.getDate()).padStart(2, "0");
const mm = String(d.getMonth() + 1).padStart(2, "0");
const yyyy = d.getFullYear();
const hh = String(d.getHours()).padStart(2, "0");
const min = String(d.getMinutes()).padStart(2, "0");
if (fmt === "%Y%m%d") return `${yyyy}${mm}${dd}`;
return `${dd}.${mm}.${yyyy} ${hh}:${min}`;
});
// Format decimal price to 2 decimal places
env.addFilter("price", (v: number | string | null | undefined) => {
if (v == null) return "";
return Number(v).toFixed(2);
});
export function render(template: string, ctx: Record<string, unknown> = {}): string {
return env.render(template, ctx);
}

361
web/src/lib/syncEngine.ts Normal file
View File

@@ -0,0 +1,361 @@
import { db } from "../db/client.js";
import { evotor_connections, vk_connections, sync_configs, sync_filters, cached_products } from "../db/schema.js";
import { eq, and } from "drizzle-orm";
import { config } from "../config.js";
import type { SyncFilter } from "../db/schema.js";
const VK_API_HOST = "https://api.vk.ru/method";
const VK_API_VERSION = "5.199";
const EVOTOR_API_BASE = "https://api.evotor.ru";
const VK_CATEGORY_ID = 40932;
const VK_STOCK_AMOUNT = 1000;
const WEIGHT_PRICE_MULTIPLIER = 10;
const WEIGHT_MEASURES = new Set(["г", "г.", "грамм", "граммов", "гр", "гр."]);
function isWeightMeasure(measure: string | null | undefined): boolean {
return !!measure && WEIGHT_MEASURES.has(measure.trim().toLowerCase());
}
function normalizeName(name: string): string {
return name.trim().replace(/;/g, ",");
}
function calcPrice(priceKopecks: number | null, measure: string | null): [number, string] {
const base = Math.round(Number(priceKopecks) || 0);
if (isWeightMeasure(measure)) {
return [base * WEIGHT_PRICE_MULTIPLIER, `${WEIGHT_PRICE_MULTIPLIER}${measure}`];
}
return [base, measure ?? ""];
}
function buildDescription(name: string, priceInfo: string, extraDesc: string | null): string {
let desc = `${name} (цена за ${priceInfo}.)\n\n`;
if (extraDesc) desc += extraDesc;
return desc.trim();
}
function getIncludedStoreIds(filters: SyncFilter[]): string[] {
return filters.filter((f) => f.entity_type === "store" && f.filter_mode === "include").map((f) => f.entity_id);
}
function isGroupIncluded(groupId: string | null, filters: SyncFilter[]): boolean {
const groupFilters = Object.fromEntries(
filters.filter((f) => f.entity_type === "group").map((f) => [f.entity_id, f.filter_mode])
);
if (Object.keys(groupFilters).length === 0) return true;
const mode = groupId ? groupFilters[groupId] : undefined;
if (mode === "exclude") return false;
if (mode === "include") return true;
return !Object.values(groupFilters).some((v) => v === "include");
}
function isProductIncluded(productId: string, filters: SyncFilter[]): boolean {
const productFilters = Object.fromEntries(
filters.filter((f) => f.entity_type === "product").map((f) => [f.entity_id, f.filter_mode])
);
if (Object.keys(productFilters).length === 0) return true;
const mode = productFilters[productId];
if (mode === "exclude") return false;
if (mode === "include") return true;
return !Object.values(productFilters).some((v) => v === "include");
}
// ---------------------------------------------------------------------------
// Evotor API helpers
// ---------------------------------------------------------------------------
async function evoFetchProducts(token: string, storeId: string): Promise<Array<Record<string, unknown>>> {
const resp = await fetch(`${EVOTOR_API_BASE}/stores/${storeId}/products`, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(30000),
});
if ([402, 404].includes(resp.status)) return [];
if (!resp.ok) throw new Error(`Evotor products ${resp.status}`);
const data = await resp.json() as { items?: unknown[] } | unknown[];
return (Array.isArray(data) ? data : (data as { items?: unknown[] }).items ?? []) as Array<Record<string, unknown>>;
}
async function evoFetchGroups(token: string, storeId: string): Promise<Array<Record<string, unknown>>> {
const resp = await fetch(`${EVOTOR_API_BASE}/stores/${storeId}/product-groups`, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(30000),
});
if ([402, 404].includes(resp.status)) return [];
if (!resp.ok) throw new Error(`Evotor groups ${resp.status}`);
const data = await resp.json() as { items?: unknown[] } | unknown[];
return (Array.isArray(data) ? data : (data as { items?: unknown[] }).items ?? []) as Array<Record<string, unknown>>;
}
// ---------------------------------------------------------------------------
// VK API helpers
// ---------------------------------------------------------------------------
function vkParams(token: string, extra: Record<string, unknown>): URLSearchParams {
const p: Record<string, string> = { access_token: token, v: VK_API_VERSION };
for (const [k, v] of Object.entries(extra)) p[k] = String(v);
return new URLSearchParams(p);
}
async function vkGet(token: string, method: string, params: Record<string, unknown>): Promise<unknown> {
const resp = await fetch(`${VK_API_HOST}/${method}?${vkParams(token, params)}`, {
signal: AbortSignal.timeout(30000),
});
if (!resp.ok) throw new Error(`VK ${method} ${resp.status}`);
return resp.json();
}
async function vkPost(token: string, method: string, params: Record<string, unknown>): Promise<unknown> {
const resp = await fetch(`${VK_API_HOST}/${method}`, {
method: "POST",
body: vkParams(token, params),
signal: AbortSignal.timeout(30000),
});
if (!resp.ok) throw new Error(`VK ${method} ${resp.status}`);
return resp.json();
}
async function vkGetAlbums(token: string, ownerId: string): Promise<Array<Record<string, unknown>>> {
const data = await vkGet(token, "market.getAlbums", { owner_id: ownerId, count: 200 }) as { response?: { items?: unknown[] } };
return (data.response?.items ?? []) as Array<Record<string, unknown>>;
}
async function vkCreateAlbum(token: string, ownerId: string, title: string): Promise<number | null> {
const data = await vkPost(token, "market.addAlbum", { owner_id: ownerId, title }) as { error?: unknown; response?: { market_album_id?: number } };
if (data.error) { console.error("[sync] VK create album error:", data.error); return null; }
return data.response?.market_album_id ?? null;
}
async function vkGetProducts(token: string, ownerId: string): Promise<Array<Record<string, unknown>>> {
const items: Array<Record<string, unknown>> = [];
let offset = 0;
const count = 200;
while (true) {
const data = await vkGet(token, "market.get", { owner_id: ownerId, extended: 1, with_disabled: 1, count, offset }) as { response?: { items?: unknown[] } };
const batch = (data.response?.items ?? []) as Array<Record<string, unknown>>;
items.push(...batch);
if (batch.length < count) break;
offset += count;
}
return items;
}
async function vkUploadPhoto(token: string, groupId: string, photoPath: string): Promise<string | null> {
try {
const serverData = await vkGet(token, "market.getProductPhotoUploadServer", { group_id: groupId }) as { error?: unknown; response?: { upload_url?: string } };
if (serverData.error) return null;
const uploadUrl = serverData.response?.upload_url;
if (!uploadUrl) return null;
const fs = await import("fs");
const form = new FormData();
form.append("file", new Blob([fs.readFileSync(photoPath)]), "photo.jpg");
const uploadResp = await fetch(uploadUrl, { method: "POST", body: form as BodyInit, signal: AbortSignal.timeout(60000) });
if (!uploadResp.ok) return null;
const uploadText = await uploadResp.text();
const saveData = await vkPost(token, "market.saveProductPhoto", { upload_response: uploadText }) as { error?: unknown; response?: { photo_id?: string } };
if (saveData.error) return null;
return saveData.response?.photo_id ?? null;
} catch (err) {
console.error("[sync] photo upload error:", err);
return null;
}
}
async function vkCreateProduct(
token: string, ownerId: string, name: string, description: string,
price: number, stockAmount: number, photoId: string, albumId: number | null,
): Promise<number | null> {
const data = await vkPost(token, "market.add", {
owner_id: ownerId, name, description, category_id: VK_CATEGORY_ID,
price, main_photo_id: photoId, stock_amount: stockAmount,
}) as { error?: unknown; response?: { market_item_id?: number } };
if (data.error) { console.error("[sync] VK create product error:", data.error); return null; }
const productId = data.response?.market_item_id ?? null;
if (productId && albumId) {
await vkGet(token, "market.addToAlbum", { owner_id: ownerId, item_ids: productId, album_ids: albumId }).catch(() => {});
}
return productId;
}
async function vkEditProduct(
token: string, ownerId: string, itemId: number, name: string,
description: string, price: number, stockAmount: number,
): Promise<void> {
const data = await vkPost(token, "market.edit", {
owner_id: ownerId, item_id: itemId, name, description, category_id: VK_CATEGORY_ID, price, stock_amount: stockAmount,
}) as { error?: unknown };
if (data.error) console.error("[sync] VK edit product error:", data.error);
}
async function vkDeleteProduct(token: string, ownerId: string, itemId: number): Promise<void> {
await vkPost(token, "market.delete", { owner_id: ownerId, item_id: itemId }).catch(() => {});
}
// ---------------------------------------------------------------------------
// Main sync logic per user
// ---------------------------------------------------------------------------
async function stampSynced(userId: number, evoId: string, now: Date): Promise<void> {
await db.update(cached_products)
.set({ synced_at: now })
.where(and(eq(cached_products.user_id, userId), eq(cached_products.evotor_id, evoId)));
}
async function syncUser(
userId: number,
evoToken: string,
vkToken: string,
vkGroupId: string,
filters: SyncFilter[],
photoPath: string,
): Promise<void> {
const ownerId = `-${vkGroupId}`;
const now = new Date();
console.log(`[sync] start user_id=${userId} vk_group=${vkGroupId}`);
const storeIds = getIncludedStoreIds(filters);
if (!storeIds.length) {
console.log(`[sync] skip user_id=${userId} — no stores in filters`);
return;
}
const evoProducts: Array<Record<string, unknown>> = [];
const groupsById: Record<string, Record<string, unknown>> = {};
for (const storeId of storeIds) {
const rawGroups = await evoFetchGroups(evoToken, storeId);
for (const g of rawGroups) {
const gid = (g.uuid ?? g.id) as string;
if (gid) groupsById[gid] = g;
}
const rawProducts = await evoFetchProducts(evoToken, storeId);
for (const p of rawProducts) {
const pid = (p.uuid ?? p.id) as string;
const gid = (p.parentUuid ?? p.parent_id) as string | null;
if (!isGroupIncluded(gid, filters)) continue;
if (!isProductIncluded(pid, filters)) continue;
evoProducts.push(p);
}
}
const evoByName: Record<string, Record<string, unknown>> = {};
for (const p of evoProducts) {
const norm = normalizeName(((p.name as string) ?? "").trim());
evoByName[norm] = p;
}
const vkProducts = await vkGetProducts(vkToken, ownerId);
const vkAlbums = await vkGetAlbums(vkToken, ownerId);
const vkAlbumByTitle: Record<string, Record<string, unknown>> = {};
for (const a of vkAlbums) vkAlbumByTitle[a.title as string] = a;
// Ensure albums exist for included groups
for (const [gid, group] of Object.entries(groupsById)) {
if (!isGroupIncluded(gid, filters)) continue;
const title = (group.name as string) ?? "";
if (title && !vkAlbumByTitle[title]) {
const newId = await vkCreateAlbum(vkToken, ownerId, title);
if (newId) {
vkAlbumByTitle[title] = { id: newId, title };
console.log(`[sync] created VK album '${title}' user_id=${userId}`);
}
}
}
const vkByName: Record<string, Array<Record<string, unknown>>> = {};
for (const item of vkProducts) {
const norm = normalizeName((item.title as string) ?? "");
(vkByName[norm] ??= []).push(item);
}
// Update / create
for (const [normName, evoP] of Object.entries(evoByName)) {
const evoId = (evoP.uuid ?? evoP.id) as string;
const rawName = ((evoP.name as string) ?? "").trim();
const nameForVk = normalizeName(rawName);
const measure = (evoP.measureName ?? evoP.measure_name) as string | null;
const rawPrice = (evoP.price as number) ?? 0;
const [price, priceInfo] = calcPrice(rawPrice, measure);
const allowToSell = (evoP.allowToSell !== undefined ? evoP.allowToSell : evoP.allow_to_sell) as boolean | null;
const stockAmount = allowToSell ? VK_STOCK_AMOUNT : 0;
const extraDesc = (evoP.description as string) ?? "";
const description = buildDescription(rawName, priceInfo, extraDesc);
const gid = (evoP.parentUuid ?? evoP.parent_id) as string | null;
const groupName = gid ? (groupsById[gid]?.name as string) ?? null : null;
const album = groupName ? vkAlbumByTitle[groupName] : null;
const albumId = album ? (album.id as number) : null;
if (vkByName[normName]) {
const vkItem = vkByName[normName][0];
const vkId = vkItem.id as number;
const origPrice = parseInt(String((vkItem.price as Record<string, unknown>)?.amount ?? 0));
const origDesc = ((vkItem.description as string) ?? "").trim();
const origStock = (vkItem.stock_amount as number) ?? 0;
if (price !== origPrice || description !== origDesc || stockAmount !== origStock) {
console.log(`[sync] updating '${nameForVk}' user_id=${userId}`);
await vkEditProduct(vkToken, ownerId, vkId, nameForVk, description, price, stockAmount);
}
await stampSynced(userId, evoId, now);
} else {
if (!allowToSell) continue;
const photoId = await vkUploadPhoto(vkToken, vkGroupId, photoPath);
if (!photoId) { console.error(`[sync] skip '${nameForVk}' — photo upload failed`); continue; }
console.log(`[sync] creating '${nameForVk}' user_id=${userId}`);
const created = await vkCreateProduct(vkToken, ownerId, nameForVk, description, price, stockAmount, photoId, albumId);
if (created) await stampSynced(userId, evoId, now);
}
}
// Delete VK products not in Evotor
for (const [normName, vkItems] of Object.entries(vkByName)) {
if (evoByName[normName]) {
for (const dup of vkItems.slice(1)) {
console.log(`[sync] deleting duplicate '${normName}' id=${dup.id} user_id=${userId}`);
await vkDeleteProduct(vkToken, ownerId, dup.id as number);
}
} else {
for (const item of vkItems) {
console.log(`[sync] deleting removed '${normName}' id=${item.id} user_id=${userId}`);
await vkDeleteProduct(vkToken, ownerId, item.id as number);
}
}
}
console.log(`[sync] complete user_id=${userId}`);
}
export async function runSync(): Promise<void> {
try {
const configs = await db.select().from(sync_configs)
.where(and(eq(sync_configs.is_enabled, true)));
for (const cfg of configs) {
if (!cfg.confirmed_at) continue;
const [evo] = await db.select().from(evotor_connections).where(eq(evotor_connections.user_id, cfg.user_id)).limit(1);
const [vk] = await db.select().from(vk_connections).where(eq(vk_connections.user_id, cfg.user_id)).limit(1);
if (!evo?.access_token || !vk?.access_token || !vk.vk_user_id) continue;
const filters = await db.select().from(sync_filters).where(eq(sync_filters.sync_config_id, cfg.id));
try {
await syncUser(cfg.user_id, evo.access_token, vk.access_token, vk.vk_user_id, filters, config.VK_DEFAULT_PHOTO_PATH);
} catch (err) {
console.error(`[sync] failed for user_id=${cfg.user_id}:`, err);
}
}
} catch (err) {
console.error("[sync] runner error:", err);
}
}
export function startSyncLoop(intervalMs: number): NodeJS.Timeout {
return setInterval(() => {
runSync().catch((err) => console.error("[sync] uncaught error:", err));
}, intervalMs);
}

40
web/src/lib/validate.ts Normal file
View File

@@ -0,0 +1,40 @@
const PHONE_RE = /^\+7 \(\d{3}\) \d{3}-\d{2}-\d{2}$/;
const EMAIL_RE = /^[^@]+@[^@]+\.[^@]+$/;
export function validateRegistration(data: Record<string, string>): string[] {
const errors: string[] = [];
if (!data.first_name?.trim()) errors.push("Введите имя");
if (!data.last_name?.trim()) errors.push("Введите фамилию");
const email = data.email?.trim() ?? "";
if (!email || !EMAIL_RE.test(email)) errors.push("Введите корректный email");
const phone = data.phone?.trim() ?? "";
if (!phone || !PHONE_RE.test(phone)) errors.push("Введите телефон в формате +7 (XXX) XXX-XX-XX");
const password = data.password ?? "";
if (password.length < 8) errors.push("Пароль должен быть не менее 8 символов");
if (password !== data.password_confirm) errors.push("Пароли не совпадают");
return errors;
}
export function validateLogin(data: Record<string, string>): string[] {
const errors: string[] = [];
if (!data.email?.trim()) errors.push("Введите email");
if (!data.password) errors.push("Введите пароль");
return errors;
}
export function validateResetPassword(data: Record<string, string>): string[] {
const errors: string[] = [];
const password = data.password ?? "";
if (password.length < 8) errors.push("Пароль должен быть не менее 8 символов");
if (password !== data.password_confirm) errors.push("Пароли не совпадают");
return errors;
}
export function validateProfile(data: Record<string, string>): string[] {
const errors: string[] = [];
if (!data.first_name?.trim()) errors.push("Введите имя");
if (!data.last_name?.trim()) errors.push("Введите фамилию");
const phone = data.phone?.trim() ?? "";
if (!phone || !PHONE_RE.test(phone)) errors.push("Введите телефон в формате +7 (XXX) XXX-XX-XX");
return errors;
}

124
web/src/routes/auth.ts Normal file
View File

@@ -0,0 +1,124 @@
import { Hono } from "hono";
import { getCookie } from "hono/cookie";
import { db } from "../db/client.js";
import { users } from "../db/schema.js";
import { eq, or } from "drizzle-orm";
import { hashPassword, verifyPassword, getSessionUserId, type AppEnv } from "../lib/auth.js";
import { validateRegistration, validateLogin } from "../lib/validate.js";
import { render } from "../lib/render.js";
import { config } from "../config.js";
import { randomUUID } from "crypto";
export const authRouter = new Hono<AppEnv>();
authRouter.get("/register", async (c) => {
const userId = getSessionUserId(c);
if (userId) return c.redirect("/profile", 303);
return c.html(render("register.njk", { user: null }));
});
authRouter.post("/register", async (c) => {
const form = await c.req.formData();
const data: Record<string, string> = {};
form.forEach((v, k) => { data[k] = String(v); });
const errors = validateRegistration(data);
if (!errors.length) {
const existing = await db.select().from(users).where(
or(eq(users.email, data.email.trim()), eq(users.phone, data.phone.trim()))
).limit(1);
if (existing.length) {
if (existing[0].email === data.email.trim()) {
errors.push("Пользователь с таким email уже существует");
} else {
errors.push("Пользователь с таким телефоном уже существует");
}
}
}
if (errors.length) {
return c.html(render("register.njk", { user: null, errors, form: data }));
}
const token = randomUUID().replace(/-/g, "");
await db.insert(users).values({
first_name: data.first_name.trim(),
last_name: data.last_name.trim(),
email: data.email.trim(),
phone: data.phone.trim(),
password_hash: await hashPassword(data.password),
email_confirm_token: token,
});
const confirmUrl = `${config.BASE_URL}/confirm-email?token=${token}`;
console.log("=".repeat(40));
console.log("ПОДТВЕРЖДЕНИЕ EMAIL");
console.log(`Пользователь: ${data.email.trim()}`);
console.log(`Ссылка: ${confirmUrl}`);
console.log("=".repeat(40));
return c.html(render("confirm_email.njk", { user: null }));
});
authRouter.get("/confirm-email", async (c) => {
const token = c.req.query("token");
if (!token) {
return c.html(render("message.njk", {
user: null, title: "Ошибка", message: "Неверная или устаревшая ссылка.",
}));
}
const [user] = await db.select().from(users).where(eq(users.email_confirm_token, token)).limit(1);
if (!user) {
return c.html(render("message.njk", {
user: null, title: "Ошибка", message: "Неверная или устаревшая ссылка.",
}));
}
await db.update(users)
.set({ is_email_confirmed: true, email_confirm_token: null })
.where(eq(users.id, user.id));
return c.html(render("email_confirmed.njk", { user: null }));
});
authRouter.get("/login", async (c) => {
const userId = getSessionUserId(c);
if (userId) return c.redirect("/profile", 303);
return c.html(render("login.njk", { user: null }));
});
authRouter.post("/login", async (c) => {
const form = await c.req.formData();
const data: Record<string, string> = {};
form.forEach((v, k) => { data[k] = String(v); });
const errors = validateLogin(data);
if (errors.length) {
return c.html(render("login.njk", { user: null, errors, form: data }));
}
const [user] = await db.select().from(users).where(eq(users.email, data.email.trim())).limit(1);
if (!user || !(await verifyPassword(data.password, user.password_hash))) {
return c.html(render("login.njk", {
user: null, errors: ["Неверный email или пароль"], form: data,
}));
}
if (!user.is_email_confirmed) {
return c.html(render("login.njk", {
user: null, errors: ["Пожалуйста, подтвердите ваш email"], form: data,
}));
}
const session = c.get("session") as { set: (k: string, v: unknown) => void };
session.set("user_id", user.id);
return c.redirect("/profile", 303);
});
authRouter.get("/logout", (c) => {
const session = c.get("session") as { deleteSession: () => void };
session.deleteSession();
return c.redirect("/login", 303);
});

260
web/src/routes/catalog.ts Normal file
View File

@@ -0,0 +1,260 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users, evotor_connections, sync_configs, sync_filters, cached_stores, cached_groups, cached_products } from "../db/schema.js";
import { eq, and, sql } from "drizzle-orm";
import { getSessionUserId, type AppEnv } from "../lib/auth.js";
import { render } from "../lib/render.js";
import { refreshCatalogCache } from "../lib/evotorApi.js";
export const catalogRouter = new Hono<AppEnv>();
async function requireUser(c: Parameters<typeof getSessionUserId>[0]) {
const id = getSessionUserId(c);
if (!id) return null;
const [user] = await db.select().from(users).where(eq(users.id, id)).limit(1);
return user ?? null;
}
async function getOrCreateSyncConfig(userId: number) {
const [existing] = await db.select().from(sync_configs).where(eq(sync_configs.user_id, userId)).limit(1);
if (existing) return existing;
await db.insert(sync_configs).values({ user_id: userId, is_enabled: false });
const [created] = await db.select().from(sync_configs).where(eq(sync_configs.user_id, userId)).limit(1);
return created!;
}
async function getFilterMap(configId: number): Promise<Record<string, string>> {
const filters = await db.select().from(sync_filters).where(eq(sync_filters.sync_config_id, configId));
return Object.fromEntries(filters.map((f) => [f.entity_id, f.filter_mode]));
}
catalogRouter.get("/catalog", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [evotor] = await db.select().from(evotor_connections).where(eq(evotor_connections.user_id, user.id)).limit(1);
if (!evotor) {
return c.html(render("catalog_stores.njk", { user, evotor: null, stores: [], filter_map: {}, fetched_at: null }));
}
let stores = await db.select().from(cached_stores)
.where(eq(cached_stores.user_id, user.id))
.orderBy(cached_stores.name);
if (!stores.length) {
await refreshCatalogCache(user.id, evotor.access_token);
stores = await db.select().from(cached_stores)
.where(eq(cached_stores.user_id, user.id))
.orderBy(cached_stores.name);
}
const config = await getOrCreateSyncConfig(user.id);
const filter_map = await getFilterMap(config.id);
const fetched_at = stores[0]?.fetched_at ?? null;
return c.html(render("catalog_stores.njk", { user, evotor, stores, filter_map, fetched_at }));
});
catalogRouter.get("/catalog/groups", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const store_id = c.req.query("store_id") ?? "";
const [store] = await db.select().from(cached_stores)
.where(and(eq(cached_stores.user_id, user.id), eq(cached_stores.evotor_id, store_id))).limit(1);
if (!store) return c.redirect("/catalog", 303);
const groups = await db.select().from(cached_groups)
.where(and(eq(cached_groups.user_id, user.id), eq(cached_groups.store_evotor_id, store_id)))
.orderBy(cached_groups.name);
const product_counts: Record<string, number> = {};
for (const g of groups) {
const [row] = await db.select({ count: sql<number>`count(*)` }).from(cached_products)
.where(and(eq(cached_products.user_id, user.id), eq(cached_products.group_evotor_id, g.evotor_id)));
product_counts[g.evotor_id] = Number(row?.count ?? 0);
}
const config = await getOrCreateSyncConfig(user.id);
const filter_map = await getFilterMap(config.id);
return c.html(render("catalog_groups.njk", { user, store, groups, product_counts, filter_map }));
});
catalogRouter.get("/catalog/products", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const store_id = c.req.query("store_id") ?? "";
const group_id = c.req.query("group_id") ?? null;
const [store] = await db.select().from(cached_stores)
.where(and(eq(cached_stores.user_id, user.id), eq(cached_stores.evotor_id, store_id))).limit(1);
if (!store) return c.redirect("/catalog", 303);
let group = null;
let products;
if (group_id) {
[group] = await db.select().from(cached_groups)
.where(and(eq(cached_groups.user_id, user.id), eq(cached_groups.evotor_id, group_id))).limit(1);
products = await db.select().from(cached_products)
.where(and(
eq(cached_products.user_id, user.id),
eq(cached_products.store_evotor_id, store_id),
eq(cached_products.group_evotor_id, group_id),
))
.orderBy(cached_products.name);
} else {
products = await db.select().from(cached_products)
.where(and(eq(cached_products.user_id, user.id), eq(cached_products.store_evotor_id, store_id)))
.orderBy(cached_products.name);
}
const config = await getOrCreateSyncConfig(user.id);
const filter_map = await getFilterMap(config.id);
return c.html(render("catalog_products.njk", { user, store, group: group ?? null, products, filter_map }));
});
catalogRouter.post("/catalog/filter", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const form = await c.req.formData();
const entity_type = String(form.get("entity_type") ?? "");
const entity_id = String(form.get("entity_id") ?? "");
const entity_name = String(form.get("entity_name") ?? "") || null;
const filter_mode = String(form.get("filter_mode") ?? "");
const parent_entity_id = String(form.get("parent_entity_id") ?? "") || null;
const redirect_to = String(form.get("redirect_to") ?? "/catalog");
const config = await getOrCreateSyncConfig(user.id);
const [existing] = await db.select().from(sync_filters)
.where(and(
eq(sync_filters.sync_config_id, config.id),
eq(sync_filters.entity_type, entity_type),
eq(sync_filters.entity_id, entity_id),
)).limit(1);
if (filter_mode === "none") {
if (existing) await db.delete(sync_filters).where(eq(sync_filters.id, existing.id));
} else if (existing) {
await db.update(sync_filters)
.set({ filter_mode, entity_name })
.where(eq(sync_filters.id, existing.id));
} else {
await db.insert(sync_filters).values({
sync_config_id: config.id,
entity_type,
entity_id,
entity_name,
filter_mode,
parent_entity_id,
});
}
return c.redirect(redirect_to, 303);
});
catalogRouter.post("/catalog/refresh", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [evotor] = await db.select().from(evotor_connections).where(eq(evotor_connections.user_id, user.id)).limit(1);
if (evotor) await refreshCatalogCache(user.id, evotor.access_token);
return c.redirect("/catalog", 303);
});
catalogRouter.get("/catalog/export", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const type = c.req.query("type") ?? "products";
const store_id = c.req.query("store_id") ?? null;
const group_id = c.req.query("group_id") ?? null;
const syncConfig = await getOrCreateSyncConfig(user.id);
const fmap = await getFilterMap(syncConfig.id);
const filterLabel = (eid: string) => {
const m = fmap[eid];
if (m === "include") return "Включено";
if (m === "exclude") return "Исключено";
return "Нет правила";
};
const today = new Date().toISOString().slice(0, 10).replace(/-/g, "");
let filename: string;
const rows: string[][] = [];
const BOM = "\uFEFF";
if (type === "stores") {
filename = `stores_${today}.csv`;
rows.push(["Название", "Адрес", "ID", "Фильтр"]);
const stores = await db.select().from(cached_stores)
.where(eq(cached_stores.user_id, user.id))
.orderBy(cached_stores.name);
for (const s of stores) {
rows.push([s.name, s.address ?? "", s.evotor_id, filterLabel(s.evotor_id)]);
}
} else if (type === "groups") {
filename = `groups_${today}.csv`;
rows.push(["Магазин", "Название", "ID", "Фильтр"]);
const storeMap: Record<string, string> = {};
const allStores = await db.select().from(cached_stores).where(eq(cached_stores.user_id, user.id));
for (const s of allStores) storeMap[s.evotor_id] = s.name;
const q = db.select().from(cached_groups).where(
store_id
? and(eq(cached_groups.user_id, user.id), eq(cached_groups.store_evotor_id, store_id))
: eq(cached_groups.user_id, user.id)
).orderBy(cached_groups.name);
const groups = await q;
for (const g of groups) {
rows.push([storeMap[g.store_evotor_id] ?? "", g.name, g.evotor_id, filterLabel(g.evotor_id)]);
}
} else {
filename = `products_${today}.csv`;
rows.push(["Магазин", "Группа", "Название", "Артикул", "Цена", "Количество", "Ед. измерения", "В продаже", "ID", "Фильтр"]);
const storeMap: Record<string, string> = {};
const groupMap: Record<string, string> = {};
const allStores = await db.select().from(cached_stores).where(eq(cached_stores.user_id, user.id));
for (const s of allStores) storeMap[s.evotor_id] = s.name;
const allGroups = await db.select().from(cached_groups).where(eq(cached_groups.user_id, user.id));
for (const g of allGroups) groupMap[g.evotor_id] = g.name;
const conditions = [eq(cached_products.user_id, user.id)];
if (store_id) conditions.push(eq(cached_products.store_evotor_id, store_id));
if (group_id) conditions.push(eq(cached_products.group_evotor_id, group_id));
const products = await db.select().from(cached_products).where(and(...conditions)).orderBy(cached_products.name);
for (const p of products) {
rows.push([
storeMap[p.store_evotor_id] ?? "",
p.group_evotor_id ? (groupMap[p.group_evotor_id] ?? "") : "",
p.name,
p.article_number ?? "",
p.price ? String(p.price) : "",
p.quantity ? String(p.quantity) : "",
p.measure_name ?? "",
p.allow_to_sell === true ? "Да" : p.allow_to_sell === false ? "Нет" : "",
p.evotor_id,
filterLabel(p.evotor_id),
]);
}
}
const csv = BOM + rows.map((row) =>
row.map((cell) => `"${String(cell).replace(/"/g, '""')}"`).join(",")
).join("\r\n");
return new Response(csv, {
headers: {
"Content-Type": "text/csv; charset=utf-8",
"Content-Disposition": `attachment; filename="${filename}"`,
},
});
});

View File

@@ -0,0 +1,83 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users, evotor_connections, vk_connections } from "../db/schema.js";
import { eq } from "drizzle-orm";
import { getSessionUserId, type AppEnv } from "../lib/auth.js";
import { render } from "../lib/render.js";
export const connectionsRouter = new Hono<AppEnv>();
const SERVICE_TYPES = [
{
type: "evotor",
name: "Эвотор",
icon: "bi-shop",
description: "Подключите кассу Эвотор для синхронизации каталога товаров.",
configure_url: "/evotor",
connect_url: "/evotor",
},
{
type: "vk",
name: "ВКонтакте",
icon: "bi-bag",
description: "Подключите аккаунт ВКонтакте для публикации товаров в вашу группу.",
configure_url: "/vk",
connect_url: "/vk",
},
];
async function requireUser(c: Parameters<typeof getSessionUserId>[0]) {
const id = getSessionUserId(c);
if (!id) return null;
const [user] = await db.select().from(users).where(eq(users.id, id)).limit(1);
return user ?? null;
}
connectionsRouter.get("/connections", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [evotor] = await db.select().from(evotor_connections).where(eq(evotor_connections.user_id, user.id)).limit(1);
const [vk] = await db.select().from(vk_connections).where(eq(vk_connections.user_id, user.id)).limit(1);
const connections = SERVICE_TYPES
.map((svc) => {
const conn = svc.type === "evotor" ? evotor : vk;
if (!conn) return null;
const details = svc.type === "evotor"
? (evotor?.store_name ?? null)
: (vk?.first_name ? `${vk.first_name} ${vk.last_name ?? ""}`.trim() : null);
return { ...svc, is_online: conn.is_online, last_checked_at: conn.last_checked_at, details };
})
.filter(Boolean);
return c.html(render("connections.njk", { user, connections }));
});
connectionsRouter.get("/connections/add", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [evotor] = await db.select().from(evotor_connections).where(eq(evotor_connections.user_id, user.id)).limit(1);
const [vk] = await db.select().from(vk_connections).where(eq(vk_connections.user_id, user.id)).limit(1);
const available = SERVICE_TYPES.filter((svc) => {
return svc.type === "evotor" ? !evotor : !vk;
});
return c.html(render("connections_add.njk", { user, available }));
});
connectionsRouter.post("/connections/delete", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const svcType = c.req.query("type");
if (svcType === "evotor") {
await db.delete(evotor_connections).where(eq(evotor_connections.user_id, user.id));
} else if (svcType === "vk") {
await db.delete(vk_connections).where(eq(vk_connections.user_id, user.id));
}
return c.redirect("/connections", 303);
});

147
web/src/routes/evotor.ts Normal file
View File

@@ -0,0 +1,147 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users, evotor_connections } from "../db/schema.js";
import { eq } from "drizzle-orm";
import { getSessionUserId, type AppEnv } from "../lib/auth.js";
import { render } from "../lib/render.js";
import { config } from "../config.js";
export const evotorRouter = new Hono<AppEnv>();
const EVOTOR_APP_URL = "https://market.evotor.ru/store/apps/{app_id}";
const EVOTOR_STORES_URL = "https://api.evotor.ru/stores";
async function requireUser(c: Parameters<typeof getSessionUserId>[0]) {
const id = getSessionUserId(c);
if (!id) return null;
const [user] = await db.select().from(users).where(eq(users.id, id)).limit(1);
return user ?? null;
}
async function fetchStoreInfo(token: string): Promise<{ store_id: string | null; store_name: string | null }> {
try {
const resp = await fetch(EVOTOR_STORES_URL, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(15000),
});
if (resp.ok) {
const data = await resp.json() as unknown;
const stores = (typeof data === "object" && data !== null && "items" in data)
? (data as { items: unknown[] }).items
: (Array.isArray(data) ? data : []);
if (Array.isArray(stores) && stores.length > 0) {
const s = stores[0] as Record<string, unknown>;
return {
store_id: (s.uuid as string | null) ?? (s.id as string | null) ?? null,
store_name: (s.name as string | null) ?? null,
};
}
}
return { store_id: null, store_name: null };
} catch {
return { store_id: null, store_name: null };
}
}
evotorRouter.get("/evotor", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [connection] = await db.select().from(evotor_connections)
.where(eq(evotor_connections.user_id, user.id)).limit(1);
const error = c.req.query("error") ?? null;
const app_url = config.EVOTOR_APP_ID
? EVOTOR_APP_URL.replace("{app_id}", config.EVOTOR_APP_ID)
: null;
return c.html(render("evotor.njk", { user, connection: connection ?? null, error, app_url }));
});
// Webhook endpoint: Evotor POSTs {"userId": "...", "token": "..."}
evotorRouter.post("/evotor/callback", async (c) => {
if (config.EVOTOR_WEBHOOK_SECRET) {
const authHeader = c.req.header("Authorization") ?? "";
if (authHeader !== `Bearer ${config.EVOTOR_WEBHOOK_SECRET}`) {
return c.json({ error: "Unauthorized" }, 401);
}
}
const payload = await c.req.json() as { userId?: string; token?: string };
if (!payload.userId || !payload.token) {
return c.json({ error: "Invalid payload" }, 400);
}
const now = new Date();
const { store_id, store_name } = await fetchStoreInfo(payload.token);
const [existing] = await db.select().from(evotor_connections)
.where(eq(evotor_connections.evotor_user_id, payload.userId)).limit(1);
if (existing) {
await db.update(evotor_connections)
.set({ access_token: payload.token, store_id, store_name, is_online: true, last_checked_at: now, updated_at: now })
.where(eq(evotor_connections.id, existing.id));
} else {
await db.insert(evotor_connections).values({
evotor_user_id: payload.userId,
access_token: payload.token,
store_id,
store_name,
is_online: true,
last_checked_at: now,
});
}
return c.json({ status: "ok" });
});
evotorRouter.post("/evotor/token", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const form = await c.req.formData();
const token = String(form.get("token") ?? "").trim();
if (!token) return c.redirect("/evotor?error=empty_token", 303);
const now = new Date();
// Validate token by fetching stores
let storeInfo: { store_id: string | null; store_name: string | null };
try {
const resp = await fetch(EVOTOR_STORES_URL, {
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(15000),
});
if (resp.status === 401) return c.redirect("/evotor?error=invalid_token", 303);
storeInfo = await fetchStoreInfo(token);
} catch {
storeInfo = { store_id: null, store_name: null };
}
const [existing] = await db.select().from(evotor_connections)
.where(eq(evotor_connections.user_id, user.id)).limit(1);
if (existing) {
await db.update(evotor_connections)
.set({ access_token: token, store_id: storeInfo.store_id, store_name: storeInfo.store_name, is_online: true, last_checked_at: now, updated_at: now })
.where(eq(evotor_connections.id, existing.id));
} else {
await db.insert(evotor_connections).values({
user_id: user.id,
access_token: token,
store_id: storeInfo.store_id,
store_name: storeInfo.store_name,
is_online: true,
last_checked_at: now,
});
}
return c.redirect("/connections", 303);
});
evotorRouter.post("/evotor/disconnect", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
await db.delete(evotor_connections).where(eq(evotor_connections.user_id, user.id));
return c.redirect("/connections", 303);
});

116
web/src/routes/profile.ts Normal file
View File

@@ -0,0 +1,116 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users } from "../db/schema.js";
import { eq, and, ne } from "drizzle-orm";
import { hashPassword, verifyPassword, getSessionUserId, type AppEnv } from "../lib/auth.js";
import { validateProfile, validateResetPassword } from "../lib/validate.js";
import { render } from "../lib/render.js";
export const profileRouter = new Hono<AppEnv>();
async function requireUser(c: Parameters<typeof getSessionUserId>[0]) {
const id = getSessionUserId(c);
if (!id) return null;
const [user] = await db.select().from(users).where(eq(users.id, id)).limit(1);
return user ?? null;
}
profileRouter.get("/profile", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
return c.html(render("profile_view.njk", { user }));
});
profileRouter.get("/profile/edit", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
return c.html(render("profile_edit.njk", { user }));
});
profileRouter.post("/profile/edit", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const form = await c.req.formData();
const data: Record<string, string> = {};
form.forEach((v, k) => { data[k] = String(v); });
const errors = validateProfile(data);
if (!errors.length) {
const existing = await db.select().from(users).where(
and(eq(users.phone, data.phone.trim()), ne(users.id, user.id))
).limit(1);
if (existing.length) errors.push("Пользователь с таким телефоном уже существует");
}
if (errors.length) {
return c.html(render("profile_edit.njk", { user, errors, form: data }));
}
await db.update(users)
.set({ first_name: data.first_name.trim(), last_name: data.last_name.trim(), phone: data.phone.trim() })
.where(eq(users.id, user.id));
const [updated] = await db.select().from(users).where(eq(users.id, user.id)).limit(1);
return c.html(render("profile_edit.njk", { user: updated, success: "Профиль обновлен" }));
});
profileRouter.get("/profile/change-password", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
return c.html(render("profile_change_password.njk", { user }));
});
profileRouter.post("/profile/change-password", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const form = await c.req.formData();
const data: Record<string, string> = {};
form.forEach((v, k) => { data[k] = String(v); });
const errors: string[] = [];
const currentPassword = data.current_password ?? "";
if (!currentPassword) {
errors.push("Введите текущий пароль");
} else if (!(await verifyPassword(currentPassword, user.password_hash))) {
errors.push("Неверный текущий пароль");
}
errors.push(...validateResetPassword(data));
if (errors.length) {
return c.html(render("profile_change_password.njk", { user, errors }));
}
await db.update(users)
.set({ password_hash: await hashPassword(data.password) })
.where(eq(users.id, user.id));
return c.html(render("profile_change_password.njk", { user, success: "Пароль изменен" }));
});
profileRouter.get("/profile/delete", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
return c.html(render("profile_delete.njk", { user }));
});
profileRouter.post("/profile/delete", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const form = await c.req.formData();
const password = String(form.get("password") ?? "");
if (!password) {
return c.html(render("profile_delete.njk", { user, errors: ["Введите пароль для подтверждения"] }));
}
if (!(await verifyPassword(password, user.password_hash))) {
return c.html(render("profile_delete.njk", { user, errors: ["Неверный пароль"] }));
}
await db.delete(users).where(eq(users.id, user.id));
const session = c.get("session") as { deleteSession: () => void };
session.deleteSession();
return c.redirect("/", 303);
});

100
web/src/routes/reset.ts Normal file
View File

@@ -0,0 +1,100 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users } from "../db/schema.js";
import { eq } from "drizzle-orm";
import { hashPassword, type AppEnv } from "../lib/auth.js";
import { validateResetPassword } from "../lib/validate.js";
import { render } from "../lib/render.js";
import { config } from "../config.js";
import { randomUUID } from "crypto";
export const resetRouter = new Hono<AppEnv>();
resetRouter.get("/forgot-password", (c) => {
return c.html(render("forgot_password.njk", { user: null }));
});
resetRouter.post("/forgot-password", async (c) => {
const form = await c.req.formData();
const email = (String(form.get("email") ?? "")).trim();
if (email) {
const [user] = await db.select().from(users).where(eq(users.email, email)).limit(1);
if (user) {
const token = randomUUID().replace(/-/g, "");
const expires = new Date(Date.now() + config.PASSWORD_RESET_EXPIRE_MINUTES * 60 * 1000);
await db.update(users)
.set({ password_reset_token: token, password_reset_expires: expires })
.where(eq(users.id, user.id));
const resetUrl = `${config.BASE_URL}/reset-password?token=${token}`;
console.log("=".repeat(40));
console.log("СБРОС ПАРОЛЯ");
console.log(`Пользователь: ${user.email}`);
console.log(`Ссылка: ${resetUrl}`);
console.log(`Действительна: ${config.PASSWORD_RESET_EXPIRE_MINUTES} мин.`);
console.log("=".repeat(40));
}
}
return c.html(render("message.njk", {
user: null,
title: "Сброс пароля",
message: "Если аккаунт с таким email существует, мы отправили письмо со ссылкой для сброса пароля.",
}));
});
resetRouter.get("/reset-password", async (c) => {
const token = c.req.query("token") ?? "";
const [user] = await db.select().from(users).where(eq(users.password_reset_token, token)).limit(1);
if (!user || !user.password_reset_expires) {
return c.html(render("message.njk", {
user: null, title: "Ошибка", message: "Неверная или устаревшая ссылка.",
}));
}
if (new Date() > user.password_reset_expires) {
return c.html(render("message.njk", {
user: null, title: "Ошибка", message: "Срок действия ссылки истек.",
}));
}
return c.html(render("reset_password.njk", { user: null, token }));
});
resetRouter.post("/reset-password", async (c) => {
const token = c.req.query("token") ?? "";
const [user] = await db.select().from(users).where(eq(users.password_reset_token, token)).limit(1);
if (!user || !user.password_reset_expires) {
return c.html(render("message.njk", {
user: null, title: "Ошибка", message: "Неверная или устаревшая ссылка.",
}));
}
if (new Date() > user.password_reset_expires) {
return c.html(render("message.njk", {
user: null, title: "Ошибка", message: "Срок действия ссылки истек.",
}));
}
const form = await c.req.formData();
const data: Record<string, string> = {};
form.forEach((v, k) => { data[k] = String(v); });
const errors = validateResetPassword(data);
if (errors.length) {
return c.html(render("reset_password.njk", { user: null, token, errors }));
}
await db.update(users)
.set({ password_hash: await hashPassword(data.password), password_reset_token: null, password_reset_expires: null })
.where(eq(users.id, user.id));
return c.html(render("message.njk", {
user: null,
title: "Пароль изменен",
message: "Ваш пароль успешно изменен. Теперь вы можете войти.",
link: "/login",
link_text: "Войти",
}));
});

88
web/src/routes/sync.ts Normal file
View File

@@ -0,0 +1,88 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users, evotor_connections, vk_connections, sync_configs, sync_filters } from "../db/schema.js";
import { eq } from "drizzle-orm";
import { getSessionUserId, type AppEnv } from "../lib/auth.js";
import { render } from "../lib/render.js";
export const syncRouter = new Hono<AppEnv>();
async function requireUser(c: Parameters<typeof getSessionUserId>[0]) {
const id = getSessionUserId(c);
if (!id) return null;
const [user] = await db.select().from(users).where(eq(users.id, id)).limit(1);
return user ?? null;
}
async function getOrCreateSyncConfig(userId: number) {
const [existing] = await db.select().from(sync_configs).where(eq(sync_configs.user_id, userId)).limit(1);
if (existing) return existing;
await db.insert(sync_configs).values({ user_id: userId, is_enabled: false });
const [created] = await db.select().from(sync_configs).where(eq(sync_configs.user_id, userId)).limit(1);
return created!;
}
syncRouter.get("/sync", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [evotor] = await db.select().from(evotor_connections).where(eq(evotor_connections.user_id, user.id)).limit(1);
const [vk] = await db.select().from(vk_connections).where(eq(vk_connections.user_id, user.id)).limit(1);
const config = await getOrCreateSyncConfig(user.id);
const filters = await db.select().from(sync_filters).where(eq(sync_filters.sync_config_id, config.id));
const summary = {
stores: filters.filter((f) => f.entity_type === "store").length,
groups: filters.filter((f) => f.entity_type === "group").length,
products: filters.filter((f) => f.entity_type === "product").length,
total: filters.length,
};
let status: string;
if (config.confirmed_at && config.is_enabled) {
status = "active";
} else if (config.confirmed_at && !config.is_enabled) {
status = "paused";
} else if (summary.total > 0) {
status = "pending";
} else {
status = "unconfigured";
}
return c.html(render("sync.njk", {
user,
evotor: evotor ?? null,
vk: vk ?? null,
config,
summary,
status,
}));
});
syncRouter.post("/sync/toggle", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const config = await getOrCreateSyncConfig(user.id);
await db.update(sync_configs)
.set({ is_enabled: !config.is_enabled })
.where(eq(sync_configs.id, config.id));
return c.redirect("/sync", 303);
});
syncRouter.post("/sync/confirm", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const config = await getOrCreateSyncConfig(user.id);
const filters = await db.select().from(sync_filters).where(eq(sync_filters.sync_config_id, config.id));
if (config.is_enabled && filters.length > 0) {
await db.update(sync_configs)
.set({ confirmed_at: new Date() })
.where(eq(sync_configs.id, config.id));
}
return c.redirect("/sync", 303);
});

120
web/src/routes/vk.ts Normal file
View File

@@ -0,0 +1,120 @@
import { Hono } from "hono";
import { db } from "../db/client.js";
import { users, vk_connections } from "../db/schema.js";
import { eq } from "drizzle-orm";
import { getSessionUserId, type AppEnv } from "../lib/auth.js";
import { render } from "../lib/render.js";
import { config } from "../config.js";
export const vkRouter = new Hono<AppEnv>();
const VK_API_URL = "https://api.vk.com/method";
const VK_OAUTH_URL = "https://oauth.vk.com/authorize";
async function requireUser(c: Parameters<typeof getSessionUserId>[0]) {
const id = getSessionUserId(c);
if (!id) return null;
const [user] = await db.select().from(users).where(eq(users.id, id)).limit(1);
return user ?? null;
}
async function fetchGroupInfo(token: string): Promise<{ groupId: string | null; groupName: string | null }> {
try {
const params = new URLSearchParams({
access_token: token,
v: config.VK_API_VERSION,
filter: "admin",
extended: "1",
count: "1",
});
const resp = await fetch(`${VK_API_URL}/groups.get?${params}`, {
signal: AbortSignal.timeout(15000),
});
if (!resp.ok) return { groupId: null, groupName: null };
const data = await resp.json() as { error?: unknown; response?: { items?: Array<{ id: number; name: string }> } };
if (data.error) return { groupId: null, groupName: null };
const items = data.response?.items ?? [];
if (items.length === 0) return { groupId: null, groupName: null };
return { groupId: String(items[0].id), groupName: items[0].name };
} catch {
return { groupId: null, groupName: null };
}
}
vkRouter.get("/vk", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const [connection] = await db.select().from(vk_connections).where(eq(vk_connections.user_id, user.id)).limit(1);
const error = c.req.query("error") ?? null;
return c.html(render("vk.njk", {
user,
connection: connection ?? null,
error,
vk_client_id: config.VK_CLIENT_ID,
callback_url: `${config.BASE_URL}/vk/callback`,
}));
});
vkRouter.get("/vk/connect", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
if (!config.VK_CLIENT_ID) return c.redirect("/vk?error=no_client_id", 303);
const params = new URLSearchParams({
client_id: config.VK_CLIENT_ID,
scope: "market,groups",
redirect_uri: `${config.BASE_URL}/vk/callback`,
display: "page",
response_type: "token",
v: config.VK_API_VERSION,
});
return c.redirect(`${VK_OAUTH_URL}?${params}`, 302);
});
vkRouter.get("/vk/callback", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
return c.html(render("vk_callback.njk", { user }));
});
vkRouter.post("/vk/token", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
const form = await c.req.formData();
const token = String(form.get("token") ?? "").trim();
if (!token) return c.redirect("/vk?error=empty_token", 303);
const { groupId, groupName } = await fetchGroupInfo(token);
if (!groupId) return c.redirect("/vk?error=invalid_token", 303);
const now = new Date();
const [existing] = await db.select().from(vk_connections).where(eq(vk_connections.user_id, user.id)).limit(1);
if (existing) {
await db.update(vk_connections)
.set({ access_token: token, vk_user_id: groupId, first_name: groupName, last_name: null, is_online: true, last_checked_at: now, updated_at: now })
.where(eq(vk_connections.id, existing.id));
} else {
await db.insert(vk_connections).values({
user_id: user.id,
access_token: token,
vk_user_id: groupId,
first_name: groupName,
last_name: null,
is_online: true,
last_checked_at: now,
});
}
return c.redirect("/connections", 303);
});
vkRouter.post("/vk/disconnect", async (c) => {
const user = await requireUser(c);
if (!user) return c.redirect("/login", 303);
await db.delete(vk_connections).where(eq(vk_connections.user_id, user.id));
return c.redirect("/connections", 303);
});

View File

@@ -0,0 +1,99 @@
<!DOCTYPE html>
<html lang="ru" data-theme="light">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}ЭВОСИНК{% endblock %}</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
<link rel="stylesheet" href="/static/style.css">
</head>
<body>
<header class="site-header">
<nav class="container">
<ul>
<li><a href="/" class="brand-logo">ЭВОСИНК</a></li>
</ul>
<ul class="nav-links">
{% if user %}
<li><a href="/connections">Подключения</a></li>
<li><a href="/catalog">Каталог</a></li>
<li><a href="/sync">Синхронизация</a></li>
<li><a href="/profile"><i class="bi bi-person-circle"></i> Личный кабинет</a></li>
<li><a href="/logout" class="secondary">Выход</a></li>
{% else %}
<li><a href="/login">Вход</a></li>
<li><a href="/register">Регистрация</a></li>
{% endif %}
</ul>
{% if user %}
<details class="mobile-menu">
<summary role="button" class="outline secondary icon-btn"><i class="bi bi-list"></i></summary>
<ul>
<li><a href="/connections">Подключения</a></li>
<li><a href="/catalog">Каталог</a></li>
<li><a href="/sync">Синхронизация</a></li>
<li><a href="/profile">Личный кабинет</a></li>
<li><a href="/logout">Выход</a></li>
</ul>
</details>
{% else %}
<details class="mobile-menu">
<summary role="button" class="outline secondary icon-btn"><i class="bi bi-list"></i></summary>
<ul>
<li><a href="/login">Вход</a></li>
<li><a href="/register">Регистрация</a></li>
</ul>
</details>
{% endif %}
</nav>
</header>
<main class="container py-4">
{% if errors %}
<div role="alert" class="alert alert-danger">
{% for error in errors %}
<p>{{ error }}</p>
{% endfor %}
</div>
{% endif %}
{% if success %}
<div role="alert" class="alert alert-success">
<p>{{ success }}</p>
</div>
{% endif %}
{% block content %}{% endblock %}
</main>
{% if jivosite_widget_id %}
<script src="//code.jivosite.com/widget/{{ jivosite_widget_id }}" async></script>
{% endif %}
<script src="https://cdn.jsdelivr.net/npm/inputmask@5.0.9/dist/inputmask.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function() {
var phoneInputs = document.querySelectorAll('input[name="phone"]');
if (phoneInputs.length) {
Inputmask('+7 (999) 999-99-99', {
placeholder: '_',
showMaskOnHover: false,
clearMaskOnLostFocus: false
}).mask(phoneInputs);
}
});
</script>
<script>
document.addEventListener('invalid', function(e) {
if (e.target.validity.valueMissing) {
e.target.setCustomValidity('Пожалуйста, заполните это поле');
} else if (e.target.validity.typeMismatch) {
e.target.setCustomValidity('Пожалуйста, введите корректное значение');
}
}, true);
document.addEventListener('input', function(e) {
if (e.target.required) e.target.setCustomValidity('');
}, true);
</script>
</body>
</html>

View File

@@ -0,0 +1,119 @@
{% extends "base.njk" %}
{% block title %}Группы — {{ store.name }} — ЭВОСИНК{% endblock %}
{% block content %}
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/catalog">Каталог</a></li>
<li class="breadcrumb-item active">{{ store.name }}</li>
</ol>
<div class="d-flex align-center justify-between mb-3">
<h1 style="font-size:1.3rem; margin:0;">Группы товаров</h1>
<a href="/catalog/export?type=groups&store_id={{ store.evotor_id }}" role="button" class="outline secondary sm">
<i class="bi bi-download me-1"></i>Экспорт CSV
</a>
</div>
{% if not groups %}
<div class="empty-state">
<i class="bi bi-folder empty-icon"></i>
<p>Группы не найдены в этом магазине.</p>
<a href="/catalog/products?store_id={{ store.evotor_id }}" role="button" class="outline sm">
Посмотреть все товары магазина
</a>
</div>
{% else %}
<div class="table-scroll">
<table class="align-middle">
<thead>
<tr>
<th>Название</th>
<th>Кол-во товаров</th>
<th>Фильтр</th>
<th></th>
</tr>
</thead>
<tbody>
{% for group in groups %}
{% set mode = filter_map[group.evotor_id] %}
<tr>
<td>{{ group.name }}</td>
<td class="text-muted">{{ product_counts[group.evotor_id] or 0 }}</td>
<td>
{% if mode == "include" %}
<span class="badge badge-success">✓ Включено</span>
{% elif mode == "exclude" %}
<span class="badge badge-danger">✗ Исключено</span>
{% else %}
<span class="badge badge-light">— Нет правила</span>
{% endif %}
</td>
<td>
<div class="d-flex gap-1 justify-end">
<a href="/catalog/products?store_id={{ store.evotor_id }}&group_id={{ group.evotor_id }}"
role="button" class="outline secondary sm" title="Товары">
<i class="bi bi-arrow-right"></i>
</a>
<div class="dropdown" data-dropdown>
<button type="button" class="outline secondary sm" data-dropdown-toggle>
<i class="bi bi-funnel"></i>
</button>
<ul class="dropdown-menu">
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="group">
<input type="hidden" name="entity_id" value="{{ group.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ group.name }}">
<input type="hidden" name="filter_mode" value="include">
<input type="hidden" name="parent_entity_id" value="{{ store.evotor_id }}">
<input type="hidden" name="redirect_to" value="/catalog/groups?store_id={{ store.evotor_id }}">
<button type="submit" class="dropdown-item">✓ Включить в синхронизацию</button>
</form>
</li>
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="group">
<input type="hidden" name="entity_id" value="{{ group.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ group.name }}">
<input type="hidden" name="filter_mode" value="exclude">
<input type="hidden" name="parent_entity_id" value="{{ store.evotor_id }}">
<input type="hidden" name="redirect_to" value="/catalog/groups?store_id={{ store.evotor_id }}">
<button type="submit" class="dropdown-item">✗ Исключить из синхронизации</button>
</form>
</li>
<li><hr class="dropdown-divider"></li>
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="group">
<input type="hidden" name="entity_id" value="{{ group.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ group.name }}">
<input type="hidden" name="filter_mode" value="none">
<input type="hidden" name="parent_entity_id" value="{{ store.evotor_id }}">
<input type="hidden" name="redirect_to" value="/catalog/groups?store_id={{ store.evotor_id }}">
<button type="submit" class="dropdown-item muted">— Убрать правило</button>
</form>
</li>
</ul>
</div>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
<script>
document.querySelectorAll('[data-dropdown]').forEach(function(dd) {
dd.querySelector('[data-dropdown-toggle]').addEventListener('click', function(e) {
e.stopPropagation();
dd.classList.toggle('open');
});
});
document.addEventListener('click', function() {
document.querySelectorAll('[data-dropdown].open').forEach(function(dd) { dd.classList.remove('open'); });
});
</script>
{% endblock %}

View File

@@ -0,0 +1,144 @@
{% extends "base.njk" %}
{% block title %}Товары — ЭВОСИНК{% endblock %}
{% block content %}
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/catalog">Каталог</a></li>
<li class="breadcrumb-item"><a href="/catalog/groups?store_id={{ store.evotor_id }}">{{ store.name }}</a></li>
{% if group %}
<li class="breadcrumb-item active">{{ group.name }}</li>
{% else %}
<li class="breadcrumb-item active">Все товары</li>
{% endif %}
</ol>
<div class="d-flex align-center justify-between mb-3">
<h1 style="font-size:1.3rem; margin:0;">Товары{% if group %}: {{ group.name }}{% endif %}</h1>
<a href="/catalog/export?type=products&store_id={{ store.evotor_id }}{% if group %}&group_id={{ group.evotor_id }}{% endif %}"
role="button" class="outline secondary sm">
<i class="bi bi-download me-1"></i>Экспорт CSV
</a>
</div>
{% set redirect_back %}/catalog/products?store_id={{ store.evotor_id }}{% if group %}&group_id={{ group.evotor_id }}{% endif %}{% endset %}
{% if not products %}
<div class="empty-state">
<i class="bi bi-box empty-icon"></i>
<p>Товары не найдены.</p>
</div>
{% else %}
<div class="table-scroll">
<table class="align-middle small">
<thead>
<tr>
<th>Название</th>
<th>Артикул</th>
<th>Цена</th>
<th>Кол-во</th>
<th>Ед. изм.</th>
<th>В продаже</th>
<th>Синхронизирован</th>
<th>Фильтр</th>
<th></th>
</tr>
</thead>
<tbody>
{% for product in products %}
{% set mode = filter_map[product.evotor_id] %}
<tr>
<td>{{ product.name }}</td>
<td class="text-muted font-monospace">{{ product.article_number or "—" }}</td>
<td>{% if product.price %}{{ product.price | price }} ₽{% else %}—{% endif %}</td>
<td>{% if product.quantity != null %}{{ product.quantity }}{% else %}—{% endif %}</td>
<td class="text-muted">{{ product.measure_name or "—" }}</td>
<td>
{% if product.allow_to_sell == null %}
<span class="text-muted">—</span>
{% elif product.allow_to_sell %}
<i class="bi bi-check-circle-fill text-success"></i>
{% else %}
<i class="bi bi-x-circle-fill text-danger"></i>
{% endif %}
</td>
<td>
{% if product.synced_at %}
<span title="{{ product.synced_at | datefmt }}">
<i class="bi bi-check-circle-fill text-success"></i>
</span>
{% else %}
<span class="text-muted">—</span>
{% endif %}
</td>
<td>
{% if mode == "include" %}
<span class="badge badge-success">✓ Включено</span>
{% elif mode == "exclude" %}
<span class="badge badge-danger">✗ Исключено</span>
{% else %}
<span class="badge badge-light">— Нет правила</span>
{% endif %}
</td>
<td>
<div class="dropdown" data-dropdown>
<button type="button" class="outline secondary sm" data-dropdown-toggle>
<i class="bi bi-funnel"></i>
</button>
<ul class="dropdown-menu">
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="product">
<input type="hidden" name="entity_id" value="{{ product.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ product.name }}">
<input type="hidden" name="filter_mode" value="include">
<input type="hidden" name="parent_entity_id" value="{{ product.group_evotor_id or '' }}">
<input type="hidden" name="redirect_to" value="{{ redirect_back }}">
<button type="submit" class="dropdown-item">✓ Включить в синхронизацию</button>
</form>
</li>
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="product">
<input type="hidden" name="entity_id" value="{{ product.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ product.name }}">
<input type="hidden" name="filter_mode" value="exclude">
<input type="hidden" name="parent_entity_id" value="{{ product.group_evotor_id or '' }}">
<input type="hidden" name="redirect_to" value="{{ redirect_back }}">
<button type="submit" class="dropdown-item">✗ Исключить из синхронизации</button>
</form>
</li>
<li><hr class="dropdown-divider"></li>
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="product">
<input type="hidden" name="entity_id" value="{{ product.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ product.name }}">
<input type="hidden" name="filter_mode" value="none">
<input type="hidden" name="parent_entity_id" value="{{ product.group_evotor_id or '' }}">
<input type="hidden" name="redirect_to" value="{{ redirect_back }}">
<button type="submit" class="dropdown-item muted">— Убрать правило</button>
</form>
</li>
</ul>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
<script>
document.querySelectorAll('[data-dropdown]').forEach(function(dd) {
dd.querySelector('[data-dropdown-toggle]').addEventListener('click', function(e) {
e.stopPropagation();
dd.classList.toggle('open');
});
});
document.addEventListener('click', function() {
document.querySelectorAll('[data-dropdown].open').forEach(function(dd) { dd.classList.remove('open'); });
});
</script>
{% endblock %}

View File

@@ -0,0 +1,127 @@
{% extends "base.njk" %}
{% block title %}Каталог — ЭВОСИНК{% endblock %}
{% block content %}
<div class="d-flex align-center justify-between mb-3">
<h1 style="font-size:1.3rem; margin:0;">Каталог</h1>
<div class="d-flex gap-2">
{% if evotor %}
<form method="post" action="/catalog/refresh">
<button type="submit" class="outline secondary sm">
<i class="bi bi-arrow-clockwise me-1"></i>Обновить
</button>
</form>
<a href="/catalog/export?type=stores" role="button" class="outline secondary sm">
<i class="bi bi-download me-1"></i>Экспорт CSV
</a>
{% endif %}
</div>
</div>
{% if not evotor %}
<div role="alert" class="alert alert-warning d-flex align-center gap-2">
<i class="bi bi-exclamation-triangle-fill"></i>
<span>Эвотор не подключён. <a href="/evotor">Подключить Эвотор</a></span>
</div>
{% elif not stores %}
<div class="empty-state">
<i class="bi bi-shop empty-icon"></i>
<p>Магазины не найдены в вашем аккаунте Эвотор.</p>
</div>
{% else %}
{% if fetched_at %}
<p class="text-muted small mb-3">Последнее обновление: {{ fetched_at | datefmt }}</p>
{% endif %}
<div class="table-scroll">
<table class="align-middle">
<thead>
<tr>
<th>Название</th>
<th>Адрес</th>
<th>Фильтр</th>
<th></th>
</tr>
</thead>
<tbody>
{% for store in stores %}
{% set mode = filter_map[store.evotor_id] %}
<tr>
<td>{{ store.name }}</td>
<td class="text-muted small">{{ store.address or "—" }}</td>
<td>
{% if mode == "include" %}
<span class="badge badge-success">✓ Включено</span>
{% elif mode == "exclude" %}
<span class="badge badge-danger">✗ Исключено</span>
{% else %}
<span class="badge badge-light">— Нет правила</span>
{% endif %}
</td>
<td>
<div class="d-flex gap-1 justify-end">
<a href="/catalog/groups?store_id={{ store.evotor_id }}"
role="button" class="outline secondary sm" title="Группы">
<i class="bi bi-arrow-right"></i>
</a>
<div class="dropdown" data-dropdown>
<button type="button" class="outline secondary sm" data-dropdown-toggle>
<i class="bi bi-funnel"></i>
</button>
<ul class="dropdown-menu">
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="store">
<input type="hidden" name="entity_id" value="{{ store.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ store.name }}">
<input type="hidden" name="filter_mode" value="include">
<input type="hidden" name="redirect_to" value="/catalog">
<button type="submit" class="dropdown-item">✓ Включить в синхронизацию</button>
</form>
</li>
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="store">
<input type="hidden" name="entity_id" value="{{ store.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ store.name }}">
<input type="hidden" name="filter_mode" value="exclude">
<input type="hidden" name="redirect_to" value="/catalog">
<button type="submit" class="dropdown-item">✗ Исключить из синхронизации</button>
</form>
</li>
<li><hr class="dropdown-divider"></li>
<li>
<form method="post" action="/catalog/filter">
<input type="hidden" name="entity_type" value="store">
<input type="hidden" name="entity_id" value="{{ store.evotor_id }}">
<input type="hidden" name="entity_name" value="{{ store.name }}">
<input type="hidden" name="filter_mode" value="none">
<input type="hidden" name="redirect_to" value="/catalog">
<button type="submit" class="dropdown-item muted">— Убрать правило</button>
</form>
</li>
</ul>
</div>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
<script>
document.querySelectorAll('[data-dropdown]').forEach(function(dd) {
dd.querySelector('[data-dropdown-toggle]').addEventListener('click', function(e) {
e.stopPropagation();
dd.classList.toggle('open');
});
});
document.addEventListener('click', function() {
document.querySelectorAll('[data-dropdown].open').forEach(function(dd) { dd.classList.remove('open'); });
});
</script>
{% endblock %}

View File

@@ -0,0 +1,16 @@
{% extends "base.njk" %}
{% block title %}Подтверждение email — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-6 col-lg-5">
<article class="card mt-5 text-center">
<div class="card-body" style="padding: 2.5rem;">
<i class="bi bi-envelope-check fs-1 text-primary mb-3 d-block"></i>
<h1 style="font-size:1.3rem;" class="mb-3">Подтвердите ваш email</h1>
<p class="text-muted">Проверьте почту и нажмите на ссылку для подтверждения.</p>
</div>
</article>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,63 @@
{% extends "base.njk" %}
{% block title %}Подключения — ЭВОСИНК{% endblock %}
{% block content %}
<div class="d-flex align-center justify-between mb-4">
<h1 style="font-size:1.3rem; margin:0;">Подключения</h1>
<a href="/connections/add" role="button" class="sm">
<i class="bi bi-plus-lg me-1"></i>Добавить
</a>
</div>
{% if connections %}
<div class="row gap-3">
{% for conn in connections %}
<div class="col-sm-6 col-lg-4">
<article class="card h-100">
<div class="card-body d-flex flex-col" style="gap: 0.75rem;">
<div class="d-flex align-center" style="gap: 0.75rem;">
<i class="bi {{ conn.icon }} fs-2 text-secondary"></i>
<div class="flex-1">
<strong>{{ conn.name }}</strong>
{% if conn.details %}
<br><small class="text-muted">{{ conn.details }}</small>
{% endif %}
</div>
{% if conn.is_online %}
<i class="bi bi-circle-fill text-success fs-5" title="Онлайн"></i>
{% else %}
<i class="bi bi-circle-fill text-danger fs-5" title="Офлайн"></i>
{% endif %}
</div>
<div class="d-flex gap-2">
<a href="{{ conn.configure_url }}" role="button" class="outline sm flex-fill">Настроить</a>
<form method="post" action="/connections/delete?type={{ conn.type }}">
<button type="submit" class="outline danger sm"
onclick="return confirm('Вы уверены, что хотите отключить {{ conn.name }}?')">
Отключить
</button>
</form>
</div>
</div>
<footer class="text-muted small">
{% if conn.last_checked_at %}
Проверено: {{ conn.last_checked_at | datefmt }}
{% else %}
Статус ещё не проверялся
{% endif %}
</footer>
</article>
</div>
{% endfor %}
</div>
{% else %}
<div class="empty-state">
<i class="bi bi-plug empty-icon"></i>
<p class="mb-3">Нет подключённых сервисов</p>
<a href="/connections/add" role="button">
<i class="bi bi-plus-lg me-1"></i>Добавить подключение
</a>
</div>
{% endif %}
{% endblock %}

View File

@@ -0,0 +1,39 @@
{% extends "base.njk" %}
{% block title %}Добавить подключение — ЭВОСИНК{% endblock %}
{% block content %}
<div class="d-flex align-center mb-4" style="gap: 0.75rem;">
<a href="/connections" class="text-muted"><i class="bi bi-arrow-left fs-5"></i></a>
<h1 style="font-size:1.3rem; margin:0;">Добавить подключение</h1>
</div>
{% if available %}
<div class="row gap-3">
{% for svc in available %}
<div class="col-sm-6 col-lg-4">
<article class="card h-100">
<div class="card-body d-flex flex-col" style="gap: 0.75rem;">
<div class="d-flex align-center" style="gap: 0.75rem;">
<i class="bi {{ svc.icon }} fs-2 text-secondary"></i>
<strong>{{ svc.name }}</strong>
</div>
<p class="text-muted small flex-1">{{ svc.description }}</p>
<a href="{{ svc.connect_url }}" role="button" class="sm" style="margin-top: auto;">
Подключить <i class="bi bi-arrow-right ms-auto"></i>
</a>
</div>
</article>
</div>
{% endfor %}
</div>
{% else %}
<div class="empty-state">
<i class="bi bi-check-circle empty-icon text-success"></i>
<p class="mb-3">Все доступные сервисы подключены</p>
<a href="/connections" role="button" class="outline secondary sm">
<i class="bi bi-arrow-left me-1"></i>Вернуться к подключениям
</a>
</div>
{% endif %}
{% endblock %}

View File

@@ -0,0 +1,17 @@
{% extends "base.njk" %}
{% block title %}Email подтвержден — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-6 col-lg-5">
<article class="card mt-5 text-center">
<div class="card-body" style="padding: 2.5rem;">
<i class="bi bi-check-circle fs-1 text-success mb-3 d-block"></i>
<h1 style="font-size:1.3rem;" class="mb-3">Email подтвержден!</h1>
<p class="text-muted">Ваш email успешно подтвержден. Теперь вы можете войти в систему.</p>
<a href="/login" role="button" class="mt-2">Войти</a>
</div>
</article>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,95 @@
{% extends "base.njk" %}
{% block title %}Подключение Эвотор — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-7 col-lg-6">
{% if error %}
<div role="alert" class="alert alert-danger mt-4">
{% if error == "invalid_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Токен недействителен. Проверьте правильность и попробуйте снова.
{% elif error == "empty_token" %}
<i class="bi bi-exclamation-triangle me-2"></i>Введите токен.
{% else %}
<i class="bi bi-exclamation-triangle me-2"></i>Произошла ошибка при подключении: {{ error }}
{% endif %}
</div>
{% endif %}
<article class="card mt-4">
<header>
<h1>Подключение Эвотор</h1>
</header>
{% if connection %}
<ul class="list-group">
<li class="list-group-item">
<span class="text-muted small">Статус</span>
<span class="badge badge-success"><i class="bi bi-check-circle me-1"></i>Подключено</span>
</li>
{% if connection.store_name %}
<li class="list-group-item">
<span class="text-muted small">Магазин</span>
<span>{{ connection.store_name }}</span>
</li>
{% endif %}
{% if connection.store_id %}
<li class="list-group-item">
<span class="text-muted small">ID магазина</span>
<span class="font-monospace small text-muted">{{ connection.store_id }}</span>
</li>
{% endif %}
<li class="list-group-item">
<span class="text-muted small">Подключено</span>
<span class="small">{{ connection.connected_at | datefmt }}</span>
</li>
</ul>
<footer>
<p class="text-muted small mb-2">Обновить токен (Личный кабинет Эвотор → <strong>Приложения → ЭвоСинк → Настройки</strong>):</p>
<form method="post" action="/evotor/token">
<div class="input-group">
<input type="text" name="token" class="font-monospace" placeholder="Новый токен" required>
<button type="submit" class="outline secondary">Обновить</button>
</div>
</form>
</footer>
<div class="card-body">
<form method="post" action="/evotor/disconnect">
<button type="submit" class="outline danger w-100">Отключить аккаунт Эвотор</button>
</form>
</div>
{% else %}
<div class="card-body">
<p class="text-muted mb-3">
Для подключения вам нужно установить приложение <strong>ЭвоСинк</strong> в личном кабинете Эвотор
и скопировать токен доступа из его настроек.
</p>
<ol class="text-muted small mb-4">
{% if app_url %}
<li class="mb-1">Откройте <a href="{{ app_url }}" target="_blank" rel="noopener">приложение ЭвоСинк в магазине Эвотор <i class="bi bi-box-arrow-up-right small"></i></a> и установите его.</li>
{% else %}
<li class="mb-1">Найдите приложение <strong>ЭвоСинк</strong> в магазине Эвотор и установите его.</li>
{% endif %}
<li class="mb-1">Перейдите в раздел <strong>Приложения → ЭвоСинк → Настройки</strong>.</li>
<li class="mb-1">Скопируйте токен доступа и вставьте его в поле ниже.</li>
</ol>
<form method="post" action="/evotor/token">
<label class="small text-muted">Токен доступа
<input type="text" name="token" class="font-monospace" placeholder="Вставьте токен Эвотор" required autofocus>
</label>
<button type="submit" class="w-100">Подключить</button>
</form>
</div>
{% endif %}
</article>
<div class="mt-3 text-center">
<a href="/connections" class="text-muted small">
<i class="bi bi-arrow-left me-1"></i>Вернуться к подключениям
</a>
</div>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,24 @@
{% extends "base.njk" %}
{% block title %}Забыли пароль — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-6 col-lg-5">
<article class="card mt-4">
<div class="card-body">
<h1 style="font-size:1.3rem;" class="mb-2">Забыли пароль?</h1>
<p class="text-muted small mb-4">Введите email, указанный при регистрации.</p>
<form method="post" action="/forgot-password">
<label for="email">Email
<input type="email" id="email" name="email" required>
</label>
<button type="submit" class="w-100">Отправить ссылку для сброса</button>
</form>
<div class="text-center small mt-3">
<a href="/login">Вернуться ко входу</a>
</div>
</div>
</article>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,27 @@
{% extends "base.njk" %}
{% block title %}Вход — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-6 col-lg-5">
<article class="card mt-4">
<div class="card-body">
<h1 class="mb-4" style="font-size:1.3rem;">Вход</h1>
<form method="post" action="/login">
<label for="email">Email
<input type="email" id="email" name="email" value="{{ form.email if form else '' }}" required>
</label>
<label for="password">Пароль
<input type="password" id="password" name="password" required>
</label>
<button type="submit" class="w-100">Войти</button>
</form>
<div class="text-center small mt-3">
<a href="/forgot-password">Забыли пароль?</a><br>
<a href="/register">Зарегистрироваться</a>
</div>
</div>
</article>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,18 @@
{% extends "base.njk" %}
{% block title %}{{ title }} — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-6 col-lg-5">
<article class="card mt-5 text-center">
<div class="card-body" style="padding: 2.5rem;">
<h1 style="font-size:1.3rem;" class="mb-3">{{ title }}</h1>
<p class="text-muted">{{ message }}</p>
{% if link %}
<a href="{{ link }}" role="button" class="mt-2">{{ link_text }}</a>
{% endif %}
</div>
</article>
</div>
</div>
{% endblock %}

View File

@@ -0,0 +1,31 @@
{% extends "base.njk" %}
{% block title %}Изменить пароль — ЭВОСИНК{% endblock %}
{% block content %}
<div class="row justify-center">
<div class="col-sm-10 col-md-6 col-lg-5">
<article class="card mt-4">
<header>
<h1><i class="bi bi-key me-2"></i>Изменить пароль</h1>
</header>
<div class="card-body">
<form method="post" action="/profile/change-password">
<label for="current_password">Текущий пароль
<input type="password" id="current_password" name="current_password" required>
</label>
<label for="password">Новый пароль
<input type="password" id="password" name="password" required>
</label>
<label for="password_confirm">Подтвердить пароль
<input type="password" id="password_confirm" name="password_confirm" required>
</label>
<div class="d-flex gap-2">
<button type="submit">Изменить пароль</button>
<a href="/profile" role="button" class="outline secondary">Отмена</a>
</div>
</form>
</div>
</article>
</div>
</div>
{% endblock %}

Some files were not shown because too many files have changed in this diff Show More