From 7df9cc3901ca6099d487c078878623a30ce241ad Mon Sep 17 00:00:00 2001
From: wasrusgen <vasrusgen@gmail.com>
Date: Mon, 18 May 2026 13:39:23 +0300
Subject: [PATCH] =?UTF-8?q?refactor:=20=D0=B0=D1=83=D0=B4=D0=B8=D1=82=20?=
 =?UTF-8?q?=D1=80=D0=BE=D1=83=D1=82=D0=B5=D1=80=D0=B0=20app.js=20=E2=80=94?=
 =?UTF-8?q?=20=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D1=8B=203?=
 =?UTF-8?q?=20edge=20case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Дублирование: init() теперь вызывает routeByHash() вместо копии логики.
   #/master, #/me, #/c/cabinet теперь работают при прямом переходе по ссылке.
2. Множественные hashchange listeners: guard _hashListenerAdded.
3. #/picker → #/c/proposal в cabinet.js и me.js (неверный роут).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 miniapp/assets/app.js     | 77 ++++-----------------------------------
 miniapp/assets/cabinet.js |  4 +-
 miniapp/assets/me.js      |  2 +-
 3 files changed, 10 insertions(+), 73 deletions(-)

diff --git a/miniapp/assets/app.js b/miniapp/assets/app.js
index 128e06c..7400c1c 100644
--- a/miniapp/assets/app.js
+++ b/miniapp/assets/app.js
@@ -1625,9 +1625,13 @@ function hideSplash() {
   }, wait);
 }
 
+let _hashListenerAdded = false;
 async function init() {
   setupTelegram();
-  window.addEventListener("hashchange", routeByHash);
+  if (!_hashListenerAdded) {
+    window.addEventListener("hashchange", routeByHash);
+    _hashListenerAdded = true;
+  }
 
   const qp = new URLSearchParams(window.location.search);
   // Telegram ставит #tgWebAppData=... в hash при открытии — это НЕ наш роут.
@@ -1658,75 +1662,8 @@ async function init() {
   try {
     const me = await fetchMe();
     window.__zovMe = me; // кешируем профиль для подэкранов
-    if (location.hash.startsWith("#/podbor")) {
-      Podbor.mount(app);
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/clients")) {
-      Clients.mount(app);
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/measure")) {
-      Measurements.mount(app);
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/request")) {
-      MeasurementRequest.mount(app);
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/inbox/")) {
-      const id = location.hash.replace("#/inbox/", "");
-      renderInboxDetail(id);
-      hideSplash();
-      return;
-    }
-    if (location.hash === "#/inbox") {
-      if (typeof InboxScreen !== "undefined") InboxScreen.mount(app);
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/assembly")) {
-      Assembly.mount(app);
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/c/proposal")) {
-      app.innerHTML = "";
-      document.body.classList.remove("has-bottom-nav");
-      const oldNav = document.getElementById("bottom-nav");
-      if (oldNav) oldNav.remove();
-      if (typeof Proposals !== "undefined") {
-        Proposals.mountClient(app);
-      } else {
-        app.innerHTML = `<div class="error">Модуль подбора не загружен</div>`;
-      }
-      hideSplash();
-      return;
-    }
-    if (location.hash.startsWith("#/c/contract")) {
-      app.innerHTML = "";
-      document.body.classList.remove("has-bottom-nav");
-      const oldNavC = document.getElementById("bottom-nav");
-      if (oldNavC) oldNavC.remove();
-      if (typeof Proposals !== "undefined") {
-        Proposals.mountContractReview(app);
-      } else {
-        app.innerHTML = `<div class="error">Модуль не загружен</div>`;
-      }
-      hideSplash();
-      return;
-    }
-    if (me.role === "staff") {
-      renderStaff(me);
-    } else if (me.role === "manager") {
-      renderManager(me);
-    } else {
-      renderClient(me);
-    }
+    // Единая точка роутинга — routeByHash покрывает все маршруты
+    routeByHash();
     hideSplash();
   } catch (e) {
     console.error(e);
diff --git a/miniapp/assets/cabinet.js b/miniapp/assets/cabinet.js
index 625b78b..9a69d2b 100644
--- a/miniapp/assets/cabinet.js
+++ b/miniapp/assets/cabinet.js
@@ -76,7 +76,7 @@ const CabinetScreen = (function () {
         <div class="block" style="margin:12px 16px 0;">
           <div class="block-head">Мои подборы</div>
           <div style="padding:12px 0;color:var(--muted);font-size:13px;">Подборов пока нет</div>
-          <button class="btn-primary btn-sm" data-href="#/picker" style="margin-top:4px;">🛒 Запросить подбор</button>
+          <button class="btn-primary btn-sm" data-href="#/c/proposal" style="margin-top:4px;">🛒 Запросить подбор</button>
         </div>`;
     }
     const items = proposals.slice(0, 3).map(p => `
@@ -96,7 +96,7 @@ const CabinetScreen = (function () {
           ${proposals.length > 3 ? `<span style="font-size:12px;color:var(--accent);cursor:pointer;" data-href="#/c/proposal">Все ${proposals.length}</span>` : ""}
         </div>
         <div style="display:flex;flex-direction:column;gap:8px;padding-top:4px;">${items}</div>
-        <button class="btn-secondary btn-sm" data-href="#/picker" style="margin-top:10px;">🛒 Новый подбор</button>
+        <button class="btn-secondary btn-sm" data-href="#/c/proposal" style="margin-top:10px;">🛒 Новый подбор</button>
       </div>`;
   }
 
diff --git a/miniapp/assets/me.js b/miniapp/assets/me.js
index a010e17..aae3549 100644
--- a/miniapp/assets/me.js
+++ b/miniapp/assets/me.js
@@ -158,7 +158,7 @@ const MeScreen = (function () {
       <div class="block" style="margin:12px 16px 0;">
         <div class="podbor-cta-row" style="flex-wrap:wrap;gap:8px;padding-top:4px;">
           <button class="btn-primary" data-href="#/c/cabinet">🏠 Мой кабинет</button>
-          <button class="btn-secondary" data-href="#/picker">🛒 Подбор</button>
+          <button class="btn-secondary" data-href="#/c/proposal">🛒 Подбор</button>
         </div>
       </div>
     `;