Added landing visit log line

Cargo.lock

@@ -3255,7 +3255,7 @@ dependencies = [
 
 [[package]]
 name = "web-petting"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "chrono",
  "chrono-tz",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "web-petting"
-version = "0.1.7"
+version = "0.1.9"
 edition = "2024"
 
 [dependencies]
@@ -16,3 +16,4 @@ multer = "3"
 futures = "0.3"
 tokio = { version = "1", features = ["fs"] }
 uuid = { version = "1", features = ["v4"] }
+tracing = "0.1"

src/admin.rs

@@ -401,6 +401,8 @@ async fn setup_submit(request: Request, session: Session, db: Database) -> cot::
         login: form.login,
         password_hash: password_auth::generate_hash(&form.password),
         display_name: display,
+        telegram_chat_id: None,
+        telegram_notifications: Some(false),
         status: "active".to_string(),
         created_at: now_utc(),
         updated_at: now_utc(),
@@ -760,6 +762,8 @@ async fn add_user(request: Request, session: Session, db: Database) -> cot::Resu
                 login: form.login,
                 password_hash: password_auth::generate_hash(&form.password),
                 display_name: display,
+                telegram_chat_id: None,
+                telegram_notifications: Some(false),
                 status: "active".to_string(),
                 created_at: now_utc(),
                 updated_at: now_utc(),
@@ -788,11 +792,11 @@ async fn add_user(request: Request, session: Session, db: Database) -> cot::Resu
 #[derive(Deserialize)]
 struct SettingsForm {
     telegram_bot_token: String,
-    telegram_chat_id: String,
     contact_info: String,
     pricing_info: String,
     timezone: String,
     site_domain: String,
+    seo_keywords: String,
 }
 
 async fn save_settings(request: Request, session: Session, db: Database) -> cot::Result<Response> {
@@ -804,11 +808,11 @@ async fn save_settings(request: Request, session: Session, db: Database) -> cot:
 
     for (key, value) in [
         ("telegram_bot_token", form.telegram_bot_token),
-        ("telegram_chat_id", form.telegram_chat_id),
         ("contact_info", form.contact_info),
         ("pricing_info", form.pricing_info),
         ("timezone", form.timezone),
         ("site_domain", form.site_domain),
+        ("seo_keywords", form.seo_keywords),
     ] {
         let k = key.to_string();
         let existing = query!(Setting, $key == k).get(&db).await?;
@@ -975,6 +979,31 @@ async fn user_activate(
     Redirect::new(format!("/admin/users?lang={}", lang.code())).into_response()
 }
 
+#[derive(Deserialize)]
+struct UserTelegramForm {
+    telegram_chat_id: Option<String>,
+    telegram_notifications: Option<String>,
+}
+
+async fn user_update_telegram(
+    request: Request,
+    session: Session,
+    db: Database,
+    Path(user_id): Path<i64>,
+) -> cot::Result<Response> {
+    let (lang, form): (_, UserTelegramForm) = parse_form_from_request(request).await?;
+    if let Err(resp) = require_auth(&session, lang).await {
+        return Ok(resp);
+    }
+    if let Some(mut user) = query!(User, $id == user_id).get(&db).await? {
+        user.telegram_chat_id = form.telegram_chat_id.filter(|s| !s.trim().is_empty());
+        user.telegram_notifications = Some(form.telegram_notifications.as_deref() == Some("true"));
+        user.updated_at = now_utc();
+        user.save(&db).await?;
+    }
+    Redirect::new(format!("/admin/users?lang={}", lang.code())).into_response()
+}
+
 #[derive(Deserialize)]
 struct AddLeadForm {
     name: String,
@@ -1145,7 +1174,7 @@ async fn schedule_events(
             .unwrap_or("?");
 
         let (bg_color, text_color) = match v.status.as_str() {
-            "cancelled" => ("#ccc".to_string(), "#666"),
+            "cancelled" => ("#ffb3b3".to_string(), "#a00"),
             "completed" => (format!("{}88", client_color), "#fff"),
             _ => (client_color.to_string(), "#fff"),
         };
@@ -1614,8 +1643,10 @@ async fn media_delete(
         .and_then(|v| v.to_str().ok())
         .map(|s| s.to_string());
     if let Some(mut m) = query!(Media, $id == media_id).get(&db).await? {
+        let file_path = m.file_path.clone();
         m.status = "archived".to_string();
         m.save(&db).await?;
+        let _ = tokio::fs::remove_file(&file_path).await;
     }
     let redirect_url = referer
         .filter(|r| r.contains("/schedule/") && r.contains("/edit"))
@@ -2077,6 +2108,11 @@ pub fn admin_router() -> Router {
             user_activate,
             "admin-user-activate",
         ),
+        Route::with_handler_and_name(
+            "/users/{user_id}/telegram",
+            user_update_telegram,
+            "admin-user-telegram",
+        ),
         Route::with_handler_and_name("/media", media_page, "admin-media"),
         Route::with_handler_and_name(
             "/media/{visit_id}/upload",

src/i18n.rs

@@ -118,6 +118,8 @@ pub struct Translations {
     pub users_add_button: &'static str,
     pub users_error_passwords_mismatch: &'static str,
     pub users_error_login_taken: &'static str,
+    pub users_telegram_chat_id: &'static str,
+    pub users_telegram_enabled: &'static str,
 
     // Settings
     pub settings_title: &'static str,
@@ -132,6 +134,7 @@ pub struct Translations {
     pub settings_pricing_info: &'static str,
     pub settings_timezone: &'static str,
     pub settings_site_domain: &'static str,
+    pub settings_seo_keywords: &'static str,
     pub landing_contact_label: &'static str,
     pub landing_pricing_title: &'static str,
 
@@ -329,6 +332,8 @@ static RU: Translations = Translations {
     users_add_button: "Добавить",
     users_error_passwords_mismatch: "Пароли не совпадают.",
     users_error_login_taken: "Этот логин уже занят.",
+    users_telegram_chat_id: "Telegram Chat ID",
+    users_telegram_enabled: "Уведомления",
 
     settings_title: "Настройки",
     settings_key: "Параметр",
@@ -342,6 +347,7 @@ static RU: Translations = Translations {
     settings_pricing_info: "Блок с ценами (отображается на лендинге)",
     settings_timezone: "Часовой пояс (например Asia/Vladivostok)",
     settings_site_domain: "Домен сайта (например https://example.com)",
+    settings_seo_keywords: "SEO-ключевые слова (через запятую, отображаются на сайте и в мета-теге keywords)",
     landing_contact_label: "Или свяжитесь с нами напрямую",
     landing_pricing_title: "Стоимость",
 
@@ -421,7 +427,7 @@ static RU: Translations = Translations {
     schedule_delete_confirm: "Точно удалить этот визит?",
 
     landing_meta_description: "Профессиональный пет-ситтинг: кормление и уход за кошками, грызунами, рептилиями на вашей территории. Оставьте заявку — позаботимся о вашем любимце!",
-    landing_hero_title: "Позаботимся о вашем питомце, пока вас нет дома",
+    landing_hero_title: "Позаботимся о вашем питомце, пока вас нет дома. Город Хабаровск",
     landing_hero_subtitle: "Кормление и уход за кошками, грызунами, рептилиями на вашей территории. Ежедневные визиты — ваш питомец в надёжных руках, пока вы в отпуске или командировке.",
     landing_hero_description: "Почему лучше оставить кошку дома на время отъезда, чем, скажем, поместить в зоогостиницу? Как известно — кошка территориальное животное. Поэтому, когда кошка оказывается на незнакомой территории — она может испытывать стресс. К тому же в зоогостинице животное часто содержится в клетке. А кошки любят свободу. И дома ожидать своих хозяев — ей будет гораздо проще и комфортнее.",
     landing_hero_cta: "Оставить заявку",
@@ -529,6 +535,8 @@ static EN: Translations = Translations {
     users_add_button: "Add",
     users_error_passwords_mismatch: "Passwords do not match.",
     users_error_login_taken: "This login is already taken.",
+    users_telegram_chat_id: "Telegram Chat ID",
+    users_telegram_enabled: "Notifications",
 
     settings_title: "Settings",
     settings_key: "Parameter",
@@ -542,6 +550,7 @@ static EN: Translations = Translations {
     settings_pricing_info: "Pricing block (shown on landing page)",
     settings_timezone: "Timezone (e.g. Asia/Vladivostok)",
     settings_site_domain: "Site domain (e.g. https://example.com)",
+    settings_seo_keywords: "SEO keywords (comma-separated, shown on site and in keywords meta tag)",
     landing_contact_label: "Or contact us directly",
     landing_pricing_title: "Pricing",
 

src/migrations.rs

@@ -7,6 +7,7 @@ pub mod m_0002_visit_schedule;
 pub mod m_0003_visit_feedback;
 pub mod m_0004_visit_public_notes;
 pub mod m_0005_testimonials;
+pub mod m_0006_user_telegram;
 /// The list of migrations for current app.
 pub const MIGRATIONS: &[&::cot::db::migrations::SyncDynMigration] = &[
     &m_0001_initial::Migration,
@@ -14,4 +15,5 @@ pub const MIGRATIONS: &[&::cot::db::migrations::SyncDynMigration] = &[
     &m_0003_visit_feedback::Migration,
     &m_0004_visit_public_notes::Migration,
     &m_0005_testimonials::Migration,
+    &m_0006_user_telegram::Migration,
 ];

src/migrations/m_0006_user_telegram.rs

@@ -0,0 +1,35 @@
+//! Migration: add telegram_chat_id and telegram_notifications to User
+
+#[derive(Debug, Copy, Clone)]
+pub(super) struct Migration;
+impl ::cot::db::migrations::Migration for Migration {
+    const APP_NAME: &'static str = "web-petting";
+    const MIGRATION_NAME: &'static str = "m_0006_user_telegram";
+    const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] =
+        &[::cot::db::migrations::MigrationDependency::migration(
+            "web-petting",
+            "m_0005_testimonials",
+        )];
+    const OPERATIONS: &'static [::cot::db::migrations::Operation] = &[
+        ::cot::db::migrations::Operation::add_field()
+            .table_name(::cot::db::Identifier::new("web_petting__user"))
+            .field(
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("telegram_chat_id"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+            )
+            .build(),
+        ::cot::db::migrations::Operation::add_field()
+            .table_name(::cot::db::Identifier::new("web_petting__user"))
+            .field(
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("telegram_notifications"),
+                    <Option<bool> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<bool> as ::cot::db::DatabaseField>::NULLABLE),
+            )
+            .build(),
+    ];
+}

src/models.rs

@@ -179,6 +179,8 @@ pub struct User {
     pub login: String,
     pub password_hash: String,
     pub display_name: Option<String>,
+    pub telegram_chat_id: Option<String>,
+    pub telegram_notifications: Option<bool>,
     /// active | archived
     pub status: String,
     pub created_at: chrono::NaiveDateTime,

src/public.rs

@@ -6,6 +6,7 @@ use cot::request::extractors::Path;
 use cot::response::{IntoResponse, Redirect, Response};
 use cot::router::{Route, Router};
 use serde::Deserialize;
+use tracing::info;
 
 use cot::db::query;
 
@@ -71,6 +72,7 @@ struct LandingTemplate<'a> {
     lang: Lang,
     contact_info: String,
     pricing_info: String,
+    seo_keywords: String,
     testimonials: Vec<Testimonial>,
     site_domain: String,
     review_count: usize,
@@ -85,6 +87,33 @@ struct ThankYouTemplate<'a> {
 
 async fn landing_page(request: Request, db: Database) -> cot::Result<Response> {
     let lang = detect_lang(&request);
+
+    let ua = request
+        .headers()
+        .get("user-agent")
+        .and_then(|v| v.to_str().ok())
+        .unwrap_or("-");
+    let referer = request
+        .headers()
+        .get("referer")
+        .and_then(|v| v.to_str().ok())
+        .unwrap_or("-");
+    let ip = request
+        .headers()
+        .get("x-forwarded-for")
+        .and_then(|v| v.to_str().ok())
+        .and_then(|s| s.split(',').next())
+        .map(|s| s.trim())
+        .unwrap_or("-");
+
+    info!(
+        target: "landing",
+        ip = ip,
+        lang = lang.code(),
+        referer = referer,
+        ua = ua,
+        "landing visit"
+    );
     let key = "contact_info".to_string();
     let contact_info = query!(Setting, $key == key)
         .get(&db)
@@ -103,6 +132,12 @@ async fn landing_page(request: Request, db: Database) -> cot::Result<Response> {
         .await?
         .map(|s| s.value)
         .unwrap_or_else(|| "https://example.net".to_string());
+    let seo_key = "seo_keywords".to_string();
+    let seo_keywords = query!(Setting, $key == seo_key)
+        .get(&db)
+        .await?
+        .map(|s| s.value)
+        .unwrap_or_default();
     let mut testimonials = Testimonial::objects().all(&db).await?;
     testimonials.retain(|t| t.status == "active");
     testimonials.sort_by(|a, b| a.sort_order.cmp(&b.sort_order));
@@ -112,6 +147,7 @@ async fn landing_page(request: Request, db: Database) -> cot::Result<Response> {
         lang,
         contact_info,
         pricing_info,
+        seo_keywords,
         testimonials,
         site_domain,
         review_count,

src/telegram.rs

@@ -1,8 +1,8 @@
 use cot::db::{Database, query};
 
-use crate::models::Setting;
+use crate::models::{Setting, User};
 
-/// Send a Telegram message using bot settings from DB.
+/// Send a Telegram notification to all admins with notifications enabled.
 /// Silently ignores errors (missing config, network issues) — notifications are best-effort.
 pub async fn notify_new_lead(
     db: &Database,
@@ -14,10 +14,6 @@ pub async fn notify_new_lead(
         Some(t) if !t.is_empty() => t,
         _ => return,
     };
-    let chat_id = match get_setting(db, "telegram_chat_id").await {
-        Some(c) if !c.is_empty() => c,
-        _ => return,
-    };
 
     let mut text = format!("📋 Новая заявка!\n\nИмя: {name}");
     if let Some(phone) = phone.filter(|s| !s.is_empty()) {
@@ -27,15 +23,33 @@ pub async fn notify_new_lead(
         text.push_str(&format!("\nКомментарий: {comment}"));
     }
 
+    let active = "active".to_string();
+    let users = match query!(User, $status == active).all(db).await {
+        Ok(u) => u,
+        Err(_) => return,
+    };
+
+    let client = reqwest::Client::new();
     let url = format!("https://api.telegram.org/bot{token}/sendMessage");
-    let _ = reqwest::Client::new()
+
-        .post(&url)
+    for user in &users {
-        .json(&serde_json::json!({
+        if user.telegram_notifications != Some(true) {
-            "chat_id": chat_id,
+            continue;
-            "text": text,
+        }
-        }))
+        let chat_id = match &user.telegram_chat_id {
-        .send()
+            Some(id) if !id.is_empty() => id,
-        .await;
+            _ => continue,
+        };
+
+        let _ = client
+            .post(&url)
+            .json(&serde_json::json!({
+                "chat_id": chat_id,
+                "text": text,
+            }))
+            .send()
+            .await;
+    }
 }
 
 async fn get_setting(db: &Database, key_name: &str) -> Option<String> {

templates/admin/layout.html

@@ -26,15 +26,24 @@
             position: fixed; bottom: 0; left: 0; right: 0; z-index: 30;
             background: #fff; border-top: 1px solid #e8e8e8;
             display: flex; height: 3.5rem;
+            overflow-x: auto; -webkit-overflow-scrolling: touch;
+            scrollbar-width: none;
         }
+        .bottom-tabs::-webkit-scrollbar { display: none; }
         .bottom-tabs a {
-            flex: 1; display: flex; flex-direction: column; align-items: center;
+            flex: 0 0 auto; min-width: 3.2rem; padding: 0 0.45rem;
+            display: flex; flex-direction: column; align-items: center;
             justify-content: center; text-decoration: none; color: #999;
-            font-size: 0.65rem; font-weight: 600; gap: 0.15rem;
+            font-size: 0.6rem; font-weight: 600; gap: 0.1rem;
-            transition: color 0.15s;
+            transition: color 0.15s; white-space: nowrap;
         }
         .bottom-tabs a .tab-icon { font-size: 1.25rem; line-height: 1; }
+        .bottom-tabs a .tab-label { display: block; }
         .bottom-tabs a.is-active { color: var(--accent); }
+        @media (max-width: 400px) {
+            .bottom-tabs a .tab-label { display: none; }
+            .bottom-tabs a { min-width: 2.8rem; padding: 0 0.3rem; }
+        }
 
         /* ── Desktop: hide bottom tabs, show top nav ── */
         .desktop-nav { display: none; }
@@ -135,28 +144,28 @@
 <!-- Bottom tabs (mobile) -->
 <nav class="bottom-tabs">
     <a href="/admin/?lang={{ lang.code() }}" {% if active_page == "dashboard" %}class="is-active"{% endif %}>
-        <span class="tab-icon">🏠</span>{{ t.dashboard_title }}
+        <span class="tab-icon">🏠</span><span class="tab-label">{{ t.dashboard_title }}</span>
     </a>
     <a href="/admin/leads?lang={{ lang.code() }}" {% if active_page == "leads" %}class="is-active"{% endif %}>
-        <span class="tab-icon">📋</span>{{ t.nav_leads }}
+        <span class="tab-icon">📋</span><span class="tab-label">{{ t.nav_leads }}</span>
     </a>
     <a href="/admin/clients?lang={{ lang.code() }}" {% if active_page == "clients" %}class="is-active"{% endif %}>
-        <span class="tab-icon">👥</span>{{ t.nav_clients }}
+        <span class="tab-icon">👥</span><span class="tab-label">{{ t.nav_clients }}</span>
     </a>
     <a href="/admin/schedule?lang={{ lang.code() }}" {% if active_page == "schedule" %}class="is-active"{% endif %}>
-        <span class="tab-icon">📅</span>{{ t.nav_schedule }}
+        <span class="tab-icon">📅</span><span class="tab-label">{{ t.nav_schedule }}</span>
     </a>
     <a href="/admin/media?lang={{ lang.code() }}" {% if active_page == "media" %}class="is-active"{% endif %}>
-        <span class="tab-icon">📷</span>{{ t.nav_media }}
+        <span class="tab-icon">📷</span><span class="tab-label">{{ t.nav_media }}</span>
     </a>
     <a href="/admin/testimonials?lang={{ lang.code() }}" {% if active_page == "testimonials" %}class="is-active"{% endif %}>
-        <span class="tab-icon">💬</span>{{ t.nav_testimonials }}
+        <span class="tab-icon">💬</span><span class="tab-label">{{ t.nav_testimonials }}</span>
     </a>
     <a href="/admin/users?lang={{ lang.code() }}" {% if active_page == "users" %}class="is-active"{% endif %}>
-        <span class="tab-icon">🔑</span>{{ t.nav_users }}
+        <span class="tab-icon">🔑</span><span class="tab-label">{{ t.nav_users }}</span>
     </a>
     <a href="/admin/settings?lang={{ lang.code() }}" {% if active_page == "settings" %}class="is-active"{% endif %}>
-        <span class="tab-icon">⚙️</span>{{ t.nav_settings }}
+        <span class="tab-icon">⚙️</span><span class="tab-label">{{ t.nav_settings }}</span>
     </a>
 </nav>
 

templates/admin/leads.html

@@ -33,12 +33,6 @@
         </div>
         {% if lead.status == "new" || lead.status == "in_progress" %}
         <div class="item-card-actions">
-            {% if lead.status == "new" %}
-                <form method="post" action="/admin/leads/{{ lead.id }}/status">
-                    <input type="hidden" name="status" value="in_progress">
-                    <button type="submit" class="button is-small is-info is-outlined btn-sm">{{ t.action_in_progress }}</button>
-                </form>
-            {% endif %}
             <form method="post" action="/admin/leads/{{ lead.id }}/convert">
                 <button type="submit" class="button is-small is-success is-outlined btn-sm">{{ t.action_convert }}</button>
             </form>

templates/admin/media_upload.html

@@ -14,12 +14,13 @@
         <div><strong>{{ t.schedule_date }}:</strong> {{ visit_label }}</div>
     </div>
 
-    <form method="post" action="/admin/media/{{ visit_id }}/upload/submit" enctype="multipart/form-data">
+    <form id="uploadForm" action="/admin/media/{{ visit_id }}/upload/submit" enctype="multipart/form-data">
         <div class="field">
             <label class="label">{{ t.media_choose_files }}</label>
             <div class="control">
-                <input class="input" type="file" name="files" multiple accept="image/*,video/*" required>
+                <input class="input" type="file" id="uploadFiles" name="files" multiple accept="image/*,video/*" required>
             </div>
+            <p id="fileCount" style="font-size:0.8rem;color:#888;margin-top:0.3rem;"></p>
         </div>
 
         <div class="field">
@@ -29,7 +30,80 @@
             </div>
         </div>
 
-        <button type="submit" class="button is-primary is-fullwidth">{{ t.media_upload }}</button>
+        <!-- Progress -->
+        <div id="uploadProgress" style="display:none;margin-bottom:1rem;">
+            <div style="display:flex;justify-content:space-between;font-size:0.82rem;color:#555;margin-bottom:0.3rem;">
+                <span id="uploadStatusText">{{ t.media_upload }}...</span>
+                <span id="uploadPercent">0%</span>
+            </div>
+            <div style="background:#e8e8e8;border-radius:99px;height:8px;overflow:hidden;">
+                <div id="uploadBar" style="height:100%;width:0%;background:linear-gradient(90deg,#6c63ff,#b06cff);border-radius:99px;transition:width 0.2s;"></div>
+            </div>
+        </div>
+
+        <button type="submit" id="uploadSubmit" class="button is-primary is-fullwidth">{{ t.media_upload }}</button>
     </form>
+
+    <script>
+    (function() {
+        var form       = document.getElementById('uploadForm');
+        var filesInput = document.getElementById('uploadFiles');
+        var fileCount  = document.getElementById('fileCount');
+        var progress   = document.getElementById('uploadProgress');
+        var bar        = document.getElementById('uploadBar');
+        var percent    = document.getElementById('uploadPercent');
+        var statusText = document.getElementById('uploadStatusText');
+        var submitBtn  = document.getElementById('uploadSubmit');
+
+        filesInput.addEventListener('change', function() {
+            var n = this.files.length;
+            fileCount.textContent = n > 0 ? ('Выбрано файлов: ' + n) : '';
+        });
+
+        form.addEventListener('submit', function(e) {
+            e.preventDefault();
+            if (!filesInput.files.length) return;
+
+            var data = new FormData(form);
+            var xhr  = new XMLHttpRequest();
+
+            progress.style.display = 'block';
+            submitBtn.disabled = true;
+            submitBtn.textContent = 'Загрузка...';
+            bar.style.width = '0%';
+            percent.textContent = '0%';
+
+            xhr.upload.addEventListener('progress', function(ev) {
+                if (!ev.lengthComputable) return;
+                var pct = Math.round(ev.loaded / ev.total * 100);
+                bar.style.width = pct + '%';
+                percent.textContent = pct + '%';
+                if (pct === 100) statusText.textContent = 'Обработка...';
+            });
+
+            xhr.addEventListener('load', function() {
+                if (xhr.status >= 200 && xhr.status < 400) {
+                    bar.style.width = '100%';
+                    percent.textContent = '100%';
+                    statusText.textContent = 'Готово!';
+                    setTimeout(function() { window.location.href = xhr.responseURL || '/admin/media'; }, 300);
+                } else {
+                    statusText.textContent = 'Ошибка загрузки (' + xhr.status + ')';
+                    submitBtn.disabled = false;
+                    submitBtn.textContent = '{{ t.media_upload }}';
+                }
+            });
+
+            xhr.addEventListener('error', function() {
+                statusText.textContent = 'Ошибка соединения';
+                submitBtn.disabled = false;
+                submitBtn.textContent = '{{ t.media_upload }}';
+            });
+
+            xhr.open('POST', form.action);
+            xhr.send(data);
+        });
+    })();
+    </script>
 </div>
 {% endblock %}

templates/admin/schedule.html

@@ -32,6 +32,10 @@
     .fc .fc-toolbar-title { font-size: 1.1rem !important; }
     .fc .fc-button { padding: 0.25rem 0.5rem !important; font-size: 0.8rem !important; }
     .fc-event { cursor: pointer; border: none !important; padding: 2px 5px; border-radius: 4px; }
+    .fc-event.ev-completed .fc-event-title,
+    .fc-event.ev-completed .fc-list-event-title { text-decoration: line-through; opacity: 0.75; }
+    .fc-event.ev-cancelled .fc-event-title,
+    .fc-event.ev-cancelled .fc-list-event-title { text-decoration: line-through; }
     .fc .fc-day-today { background: #eef2ff !important; }
     .fc .fc-day.day-weekend { background: #faf5f0; }
     .fc .fc-day-today.day-weekend { background: #eef2ff !important; }
@@ -45,8 +49,6 @@
     .visit-modal { background:#fff; border-radius:12px; padding:1.5rem; width:90%; max-width:380px; box-shadow:0 4px 24px rgba(0,0,0,0.15); }
     .visit-modal h3 { margin:0 0 0.75rem; font-size:1.1rem; }
     .visit-modal .meta { color:#888; font-size:0.85rem; margin-bottom:0.75rem; line-height:1.6; }
-    .visit-modal .actions { display:flex; gap:0.5rem; flex-wrap:wrap; }
-    .visit-modal .actions form { margin:0; }
     .color-dot { display:inline-block; width:12px; height:12px; border-radius:50%; margin-right:6px; vertical-align:middle; }
 </style>
 
@@ -60,12 +62,8 @@
             <div id="vmTime"></div>
             <div id="vmNotes" style="margin-top:0.3rem;"></div>
         </div>
-        <div id="vmStatus" style="margin-bottom:0.75rem;"></div>
+        <div id="vmStatus" style="margin-bottom:1rem;"></div>
-        <div class="actions" id="vmActions"></div>
+        <a id="vmEditLink" href="#" class="button is-primary is-fullwidth" style="font-size:1rem;font-weight:700;padding:0.65rem;">📋 {{ t.schedule_edit_title }}</a>
-        <div style="display:flex;gap:0.5rem;margin-top:0.5rem;">
-            <a id="vmEditLink" href="#" class="button is-info is-small" style="flex:1;">{{ t.schedule_edit_title }}</a>
-            <button class="button is-light is-small" style="flex:1;" onclick="closeModal()">OK</button>
-        </div>
     </div>
 </div>
 
@@ -89,6 +87,11 @@ document.addEventListener('DOMContentLoaded', function() {
             right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
         },
         events: '/admin/schedule/events',
+        eventDidMount: function(info) {
+            var status = info.event.extendedProps.status;
+            if (status === 'completed') info.el.classList.add('ev-completed');
+            if (status === 'cancelled') info.el.classList.add('ev-cancelled');
+        },
         eventClick: function(info) {
             info.jsEvent.preventDefault();
             const ev = info.event;
@@ -102,12 +105,6 @@ document.addEventListener('DOMContentLoaded', function() {
             document.getElementById('vmNotes').textContent = p.notes || '';
             const badge = '<span class="badge badge-visit-' + p.status + '">' + statusLabels[p.status] + '</span>';
             document.getElementById('vmStatus').innerHTML = badge;
-            let actions = '';
-            if (p.status === 'scheduled') {
-                actions += '<form method="post" action="/admin/schedule/' + ev.id + '/done"><button class="button is-small is-success is-outlined">{{ t.schedule_mark_done }}</button></form>';
-                actions += '<form method="post" action="/admin/schedule/' + ev.id + '/cancel"><button class="button is-small is-danger is-outlined">{{ t.schedule_cancel }}</button></form>';
-            }
-            document.getElementById('vmActions').innerHTML = actions;
             document.getElementById('vmEditLink').href = '/admin/schedule/' + ev.id + '/edit?lang=' + lang;
             document.getElementById('visitModal').classList.add('is-open');
         },

templates/admin/schedule_edit.html

@@ -70,14 +70,17 @@
         <!-- Status -->
         <div class="field">
             <label class="label">{{ t.schedule_status }}</label>
-            <div class="control">
+            <input type="hidden" name="status" id="statusInput" value="{{ visit.status }}">
-                <div class="select is-fullwidth">
+            <div class="status-picker">
-                    <select name="status">
+                <button type="button" class="status-btn status-btn-scheduled {% if visit.status == "scheduled" %}is-active{% endif %}" data-value="scheduled">
-                        <option value="scheduled" {% if visit.status == "scheduled" %}selected{% endif %}>{{ t.visit_status_scheduled }}</option>
+                    <span class="status-btn-icon">📅</span>{{ t.visit_status_scheduled }}
-                        <option value="completed" {% if visit.status == "completed" %}selected{% endif %}>{{ t.visit_status_completed }}</option>
+                </button>
-                        <option value="cancelled" {% if visit.status == "cancelled" %}selected{% endif %}>{{ t.visit_status_cancelled }}</option>
+                <button type="button" class="status-btn status-btn-completed {% if visit.status == "completed" %}is-active{% endif %}" data-value="completed">
-                    </select>
+                    <span class="status-btn-icon">✅</span>{{ t.visit_status_completed }}
-                </div>
+                </button>
+                <button type="button" class="status-btn status-btn-cancelled {% if visit.status == "cancelled" %}is-active{% endif %}" data-value="cancelled">
+                    <span class="status-btn-icon">✕</span>{{ t.visit_status_cancelled }}
+                </button>
             </div>
         </div>
 
@@ -150,14 +153,15 @@
     <div class="upload-modal">
         <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:1rem;">
             <h3 style="font-size:1.1rem;font-weight:700;margin:0;">{{ t.media_upload_title }}</h3>
-            <button type="button" style="background:none;border:none;font-size:1.2rem;cursor:pointer;color:#888;" onclick="document.getElementById('uploadModal').classList.remove('is-open')">✕</button>
+            <button type="button" id="uploadModalClose" style="background:none;border:none;font-size:1.2rem;cursor:pointer;color:#888;">✕</button>
         </div>
-        <form method="post" action="/admin/media/{{ visit.id }}/upload/submit" enctype="multipart/form-data">
+        <form id="uploadForm" action="/admin/media/{{ visit.id }}/upload/submit" enctype="multipart/form-data">
             <div class="field">
                 <label class="label">{{ t.media_choose_files }}</label>
                 <div class="control">
-                    <input class="input" type="file" name="files" multiple accept="image/*,video/*" required>
+                    <input class="input" type="file" id="uploadFiles" name="files" multiple accept="image/*,video/*" required>
                 </div>
+                <p id="fileCount" style="font-size:0.8rem;color:#888;margin-top:0.3rem;"></p>
             </div>
             <div class="field">
                 <label class="label">{{ t.media_caption }}</label>
@@ -165,12 +169,56 @@
                     <input class="input" type="text" name="caption" placeholder="{{ t.media_caption }}">
                 </div>
             </div>
-            <button type="submit" class="button is-primary is-fullwidth">{{ t.media_upload }}</button>
+
+            <!-- Progress -->
+            <div id="uploadProgress" style="display:none;margin-bottom:1rem;">
+                <div style="display:flex;justify-content:space-between;font-size:0.82rem;color:#555;margin-bottom:0.3rem;">
+                    <span id="uploadStatusText">{{ t.media_upload }}...</span>
+                    <span id="uploadPercent">0%</span>
+                </div>
+                <div style="background:#e8e8e8;border-radius:99px;height:8px;overflow:hidden;">
+                    <div id="uploadBar" style="height:100%;width:0%;background:linear-gradient(90deg,#6c63ff,#b06cff);border-radius:99px;transition:width 0.2s;"></div>
+                </div>
+            </div>
+
+            <button type="submit" id="uploadSubmit" class="button is-primary is-fullwidth">{{ t.media_upload }}</button>
         </form>
     </div>
 </div>
 
 <style>
+    .status-picker {
+        display: flex;
+        gap: 0.5rem;
+    }
+    .status-btn {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 0.3rem;
+        padding: 0.6rem 0.4rem;
+        border-radius: 10px;
+        border: 2px solid transparent;
+        background: #f5f5f5;
+        font-size: 0.82rem;
+        font-weight: 600;
+        cursor: pointer;
+        color: #777;
+        transition: all 0.15s;
+        line-height: 1.2;
+    }
+    .status-btn-icon { font-size: 1.3rem; line-height: 1; }
+    .status-btn:hover { filter: brightness(0.95); }
+
+    .status-btn-scheduled.is-active  { background: #dbeafe; border-color: #3b82f6; color: #1e40af; }
+    .status-btn-completed.is-active  { background: #d1fae5; border-color: #22c55e; color: #15803d; }
+    .status-btn-cancelled.is-active  { background: #fee2e2; border-color: #ef4444; color: #b91c1c; }
+
+    .status-btn-scheduled:not(.is-active):hover  { background: #eff6ff; color: #3b82f6; }
+    .status-btn-completed:not(.is-active):hover  { background: #f0fdf4; color: #22c55e; }
+    .status-btn-cancelled:not(.is-active):hover  { background: #fff5f5; color: #ef4444; }
+
     .visit-media-grid {
         display: grid;
         grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
@@ -229,8 +277,91 @@
 </style>
 
 <script>
-document.getElementById('uploadModal').addEventListener('click', function(e) {
+// Status picker
-    if (e.target === this) this.classList.remove('is-open');
+document.querySelectorAll('.status-btn').forEach(function(btn) {
+    btn.addEventListener('click', function() {
+        document.querySelectorAll('.status-btn').forEach(function(b) { b.classList.remove('is-active'); });
+        btn.classList.add('is-active');
+        document.getElementById('statusInput').value = btn.dataset.value;
+    });
 });
 </script>
+
+<script>
+(function() {
+    var modal = document.getElementById('uploadModal');
+    var form  = document.getElementById('uploadForm');
+    var filesInput  = document.getElementById('uploadFiles');
+    var fileCount   = document.getElementById('fileCount');
+    var progress    = document.getElementById('uploadProgress');
+    var bar         = document.getElementById('uploadBar');
+    var percent     = document.getElementById('uploadPercent');
+    var statusText  = document.getElementById('uploadStatusText');
+    var submitBtn   = document.getElementById('uploadSubmit');
+
+    // Close modal on backdrop click
+    modal.addEventListener('click', function(e) {
+        if (e.target === this) closeModal();
+    });
+    document.getElementById('uploadModalClose').addEventListener('click', closeModal);
+
+    function closeModal() {
+        if (submitBtn.disabled) return; // prevent close during upload
+        modal.classList.remove('is-open');
+    }
+
+    // Show selected file count
+    filesInput.addEventListener('change', function() {
+        var n = this.files.length;
+        fileCount.textContent = n > 0 ? ('Выбрано файлов: ' + n) : '';
+    });
+
+    // Submit via XHR for progress tracking
+    form.addEventListener('submit', function(e) {
+        e.preventDefault();
+        if (!filesInput.files.length) return;
+
+        var data = new FormData(form);
+        var xhr  = new XMLHttpRequest();
+
+        // Show progress bar, disable submit
+        progress.style.display = 'block';
+        submitBtn.disabled = true;
+        submitBtn.textContent = 'Загрузка...';
+        bar.style.width = '0%';
+        percent.textContent = '0%';
+
+        xhr.upload.addEventListener('progress', function(ev) {
+            if (!ev.lengthComputable) return;
+            var pct = Math.round(ev.loaded / ev.total * 100);
+            bar.style.width = pct + '%';
+            percent.textContent = pct + '%';
+            if (pct === 100) statusText.textContent = 'Обработка...';
+        });
+
+        xhr.addEventListener('load', function() {
+            if (xhr.status >= 200 && xhr.status < 400) {
+                bar.style.width = '100%';
+                percent.textContent = '100%';
+                statusText.textContent = 'Готово!';
+                // Reload page to show uploaded media
+                setTimeout(function() { window.location.reload(); }, 300);
+            } else {
+                statusText.textContent = 'Ошибка загрузки (' + xhr.status + ')';
+                submitBtn.disabled = false;
+                submitBtn.textContent = '{{ t.media_upload }}';
+            }
+        });
+
+        xhr.addEventListener('error', function() {
+            statusText.textContent = 'Ошибка соединения';
+            submitBtn.disabled = false;
+            submitBtn.textContent = '{{ t.media_upload }}';
+        });
+
+        xhr.open('POST', form.action);
+        xhr.send(data);
+    });
+})();
+</script>
 {% endblock %}

templates/admin/settings.html

@@ -20,12 +20,6 @@
                 <input class="input" type="text" name="telegram_bot_token" value="{% for s in &settings %}{% if s.key == "telegram_bot_token" %}{{ s.value }}{% endif %}{% endfor %}">
             </div>
         </div>
-        <div class="field">
-            <label class="label">{{ t.settings_telegram_chat_id }}</label>
-            <div class="control">
-                <input class="input" type="text" name="telegram_chat_id" value="{% for s in &settings %}{% if s.key == "telegram_chat_id" %}{{ s.value }}{% endif %}{% endfor %}">
-            </div>
-        </div>
         <div class="field">
             <label class="label">{{ t.settings_contact_info }}</label>
             <div class="control">
@@ -50,7 +44,64 @@
                 <input class="input" type="text" name="timezone" placeholder="Asia/Vladivostok" value="{% for s in &settings %}{% if s.key == "timezone" %}{{ s.value }}{% endif %}{% endfor %}">
             </div>
         </div>
+        <div class="field">
+            <label class="label">{{ t.settings_seo_keywords }}</label>
+            <div class="control">
+                <textarea id="seoKeywordsInput" class="textarea" name="seo_keywords" rows="3"
+                    style="resize:vertical;"
+                    placeholder="зооняня Хабаровск, присмотр за питомцем Хабаровск, догситтер Хабаровск">{% for s in &settings %}{% if s.key == "seo_keywords" %}{{ s.value }}{% endif %}{% endfor %}</textarea>
+            </div>
+            <div id="seoPreview" style="margin-top:0.5rem;padding:0.5rem 0.75rem;background:#fafafa;border:1px solid #eee;border-radius:6px;min-height:2rem;line-height:2;font-size:0.85rem;display:none;"></div>
+            <p style="font-size:0.78rem;color:#aaa;margin-top:0.3rem;">Каждая фраза между запятыми — отдельное ключевое слово</p>
+        </div>
+
         <button type="submit" class="button is-primary">{{ t.settings_save }}</button>
     </form>
 </div>
+
+<script>
+(function() {
+    var COLORS = [
+        'rgba(124,108,255,0.18)',
+        'rgba(255,82,135,0.15)',
+        'rgba(255,140,38,0.18)',
+        'rgba(0,180,150,0.15)',
+        'rgba(77,166,255,0.18)',
+        'rgba(255,179,64,0.18)',
+        'rgba(176,108,255,0.16)',
+        'rgba(34,180,130,0.16)',
+    ];
+
+    var ta      = document.getElementById('seoKeywordsInput');
+    var preview = document.getElementById('seoPreview');
+
+    function esc(s) {
+        return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+    }
+
+    function render() {
+        var text = ta.value.trim();
+        if (!text) { preview.style.display = 'none'; return; }
+
+        var parts = text.split(',');
+        var html = '';
+        parts.forEach(function(part, i) {
+            var word = part.trim();
+            if (word) {
+                var color = COLORS[i % COLORS.length];
+                html += '<span style="background:' + color + ';border-radius:4px;padding:2px 6px;margin:2px;">' + esc(word) + '</span>';
+            }
+            if (i < parts.length - 1) {
+                html += '<span style="color:#ccc;font-size:0.8em;margin:0 1px">,</span>';
+            }
+        });
+
+        preview.innerHTML = html;
+        preview.style.display = 'block';
+    }
+
+    ta.addEventListener('input', render);
+    render();
+})();
+</script>
 {% endblock %}

templates/admin/users.html

@@ -17,6 +17,29 @@
     <div class="item-card-meta">
         <span>🕐 {{ user.created_at.format("%d.%m.%Y %H:%M") }}</span>
     </div>
+    {% if user.status == "active" %}
+    <form method="post" action="/admin/users/{{ user.id }}/telegram" style="margin-top:0.5rem; padding-top:0.5rem; border-top:1px solid #eee;">
+        <div class="columns is-mobile is-vcentered" style="margin-bottom:0;">
+            <div class="column">
+                <div class="field" style="margin-bottom:0;">
+                    <label class="label is-small">{{ t.users_telegram_chat_id }}</label>
+                    <div class="control">
+                        <input class="input is-small" type="text" name="telegram_chat_id" placeholder="123456789" value="{{ user.telegram_chat_id.as_deref().unwrap_or_default() }}">
+                    </div>
+                </div>
+            </div>
+            <div class="column is-narrow">
+                <label class="checkbox is-small">
+                    <input type="checkbox" name="telegram_notifications" value="true" {% if user.telegram_notifications == Some(true) %}checked{% endif %}>
+                    {{ t.users_telegram_enabled }}
+                </label>
+            </div>
+            <div class="column is-narrow">
+                <button type="submit" class="button is-small is-info is-outlined">💾</button>
+            </div>
+        </div>
+    </form>
+    {% endif %}
     <div class="item-card-actions">
         {% if user.status == "active" %}
             <form method="post" action="/admin/users/{{ user.id }}/archive">

templates/landing.html

@@ -21,6 +21,10 @@
     <meta property="og:locale" content="{% if lang.code() == "ru" %}ru_RU{% else %}en_US{% endif %}">
     <meta property="og:site_name" content="{{ t.nav_title }}">
 
+    {% if !seo_keywords.is_empty() %}
+    <meta name="keywords" content="{{ seo_keywords }}">
+    {% endif %}
+
     <!-- Twitter Card -->
     <meta name="twitter:card" content="summary">
     <meta name="twitter:title" content="{{ t.nav_title }} — {{ t.landing_hero_title }}">
@@ -301,10 +305,14 @@
             border-top: 1px solid rgba(180,170,220,0.15);
             background: rgba(255,255,255,0.3);
         }
+        .seo-keywords {
+            font-size: 0.72rem; color: #aaa; line-height: 2;
+            max-width: 800px; margin: 0 auto 1rem;
+        }
 
         /* ── Mobile ── */
         @media (max-width: 600px) {
-            .hero { padding: 6.5rem 1rem 3rem; }
+            .hero { padding: 6.5rem 1rem 10rem; }
             .section { padding: 3rem 1rem; }
             .form-section { padding: 3rem 1rem; }
             .form-wrapper { padding: 1.75rem 1.25rem; }
@@ -469,6 +477,9 @@
 
 <!-- Footer -->
 <footer class="site-footer">
+    {% if !seo_keywords.is_empty() %}
+    <p class="seo-keywords" id="seoKeywords">{{ seo_keywords }}</p>
+    {% endif %}
     <p>{{ t.landing_footer_text }}</p>
     <p style="margin-top:0.4rem;">&copy; 2026 {{ t.nav_title }}. {{ t.landing_footer_copyright }}.</p>
 </footer>