From dab161ef18f1c12dbf5345b1e5e9627a3bc9e80a Mon Sep 17 00:00:00 2001 From: Sergey Karmanov Date: Thu, 14 May 2026 05:45:14 +0300 Subject: [PATCH] =?UTF-8?q?fix(ui):=20=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=B3=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B8=20=D1=83?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D1=83=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/layout/AppBottomNav.vue | 4 ++-- frontend/src/components/layout/AppSidebar.vue | 4 ++-- frontend/src/views/admin/AdminUsersView.vue | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/layout/AppBottomNav.vue b/frontend/src/components/layout/AppBottomNav.vue index 3f900f3..e311c47 100644 --- a/frontend/src/components/layout/AppBottomNav.vue +++ b/frontend/src/components/layout/AppBottomNav.vue @@ -30,8 +30,8 @@ const navItems = computed(() => { }) function isActive(to: string) { - if (to === '/') return route.path === '/' - return route.path.startsWith(to) && to !== '/' + if (to === '/' || to === '/teacher' || to === '/admin') return route.path === to + return route.path.startsWith(to) } diff --git a/frontend/src/components/layout/AppSidebar.vue b/frontend/src/components/layout/AppSidebar.vue index 0dd5933..23502aa 100644 --- a/frontend/src/components/layout/AppSidebar.vue +++ b/frontend/src/components/layout/AppSidebar.vue @@ -33,8 +33,8 @@ const visible = computed(() => ) function isActive(to: string) { - if (to === '/') return route.path === '/' - return route.path.startsWith(to) && to !== '/' + if (to === '/' || to === '/teacher' || to === '/admin') return route.path === to + return route.path.startsWith(to) } diff --git a/frontend/src/views/admin/AdminUsersView.vue b/frontend/src/views/admin/AdminUsersView.vue index 6499b0d..6c7fd06 100644 --- a/frontend/src/views/admin/AdminUsersView.vue +++ b/frontend/src/views/admin/AdminUsersView.vue @@ -90,7 +90,6 @@ onMounted(fetchUsers)

Пользователи

-