From e793b377d7dc4e0d1a31db952a39fcf8dc68f4bf Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Thu, 26 Mar 2026 09:03:19 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20-=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83?=
 =?UTF-8?q?=D1=82=D1=8B=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=20(admin.organiza?=
 =?UTF-8?q?tions.groups.*)=20-=20=D0=92=D1=8B=D0=BD=D0=B5=D1=81=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1=D0=B0=D1=80=20=D0=B2=20?=
 =?UTF-8?q?partial=20(=5Fsidebar.blade.php)=20-=20=D0=94=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=9E=D1=82=D1=87=D1=91=D1=82=D1=8B=20?=
 =?UTF-8?q?=D0=B2=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1=D0=B0=D1=80=20-=20?=
 =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B2?=
 =?UTF-8?q?=D1=81=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20partial?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 resources/views/admin/groups/create.blade.php | 13 +--
 resources/views/admin/groups/edit.blade.php   | 13 +--
 resources/views/admin/groups/index.blade.php  | 13 +--
 .../admin/organizations/create.blade.php      | 13 +--
 .../views/admin/organizations/edit.blade.php  | 13 +--
 .../views/admin/organizations/index.blade.php | 25 +-----
 .../views/admin/organizations/show.blade.php  | 15 +---
 resources/views/dashboard/admin.blade.php     | 28 +-----
 resources/views/partials/_sidebar.blade.php   | 87 +++++++++++++++++++
 9 files changed, 96 insertions(+), 124 deletions(-)
 create mode 100644 resources/views/partials/_sidebar.blade.php

diff --git a/resources/views/admin/groups/create.blade.php b/resources/views/admin/groups/create.blade.php
index 65464fd..e21b793 100644
--- a/resources/views/admin/groups/create.blade.php
+++ b/resources/views/admin/groups/create.blade.php
@@ -7,18 +7,7 @@
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/admin/groups/edit.blade.php b/resources/views/admin/groups/edit.blade.php
index 08ac2b2..58bc94c 100644
--- a/resources/views/admin/groups/edit.blade.php
+++ b/resources/views/admin/groups/edit.blade.php
@@ -7,18 +7,7 @@
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/admin/groups/index.blade.php b/resources/views/admin/groups/index.blade.php
index 868cd23..bdd25cf 100644
--- a/resources/views/admin/groups/index.blade.php
+++ b/resources/views/admin/groups/index.blade.php
@@ -7,18 +7,7 @@
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/admin/organizations/create.blade.php b/resources/views/admin/organizations/create.blade.php
index dd9d9b6..1fe9b32 100644
--- a/resources/views/admin/organizations/create.blade.php
+++ b/resources/views/admin/organizations/create.blade.php
@@ -7,18 +7,7 @@
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/admin/organizations/edit.blade.php b/resources/views/admin/organizations/edit.blade.php
index 65cc1a0..992be58 100644
--- a/resources/views/admin/organizations/edit.blade.php
+++ b/resources/views/admin/organizations/edit.blade.php
@@ -7,18 +7,7 @@
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/admin/organizations/index.blade.php b/resources/views/admin/organizations/index.blade.php
index 57b0cf2..7e7c28b 100644
--- a/resources/views/admin/organizations/index.blade.php
+++ b/resources/views/admin/organizations/index.blade.php
@@ -8,30 +8,7 @@
         <!-- Sidebar -->
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    @can('viewAny', App\Models\Organization::class)
-                    <li class="nav-item">
-                        <a class="nav-link active" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                    @endcan
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">
-                            <i class="bi bi-people"></i> Пользователи
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">
-                            <i class="bi bi-book"></i> Курсы
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/admin/organizations/show.blade.php b/resources/views/admin/organizations/show.blade.php
index a02539b..7a7ed44 100644
--- a/resources/views/admin/organizations/show.blade.php
+++ b/resources/views/admin/organizations/show.blade.php
@@ -7,18 +7,7 @@
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
@@ -148,7 +137,7 @@
                         <div class="card-header d-flex justify-content-between align-items-center">
                             <h5 class="mb-0"><i class="bi bi-people-fill"></i> Группы</h5>
                             @can('create', App\Models\Group::class)
-                            <a href="{{ route('admin.groups.create', $organization) }}" class="btn btn-sm btn-primary">
+                            <a href="{{ route('admin.organizations.groups.create', $organization) }}" class="btn btn-sm btn-primary">
                                 <i class="bi bi-plus-lg"></i>
                             </a>
                             @endcan
diff --git a/resources/views/dashboard/admin.blade.php b/resources/views/dashboard/admin.blade.php
index 1ac591c..4d97ac3 100644
--- a/resources/views/dashboard/admin.blade.php
+++ b/resources/views/dashboard/admin.blade.php
@@ -8,33 +8,7 @@
         <!-- Sidebar -->
         <nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
             <div class="position-sticky pt-3">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link active" href="{{ route('dashboard') }}">
-                            <i class="bi bi-speedometer2"></i> Панель управления
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ route('admin.organizations.index') }}">
-                            <i class="bi bi-building"></i> Организации
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">
-                            <i class="bi bi-people"></i> Пользователи
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">
-                            <i class="bi bi-book"></i> Курсы
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">
-                            <i class="bi bi-file-earmark-text"></i> Отчёты
-                        </a>
-                    </li>
-                </ul>
+                @include('partials._sidebar')
             </div>
         </nav>
 
diff --git a/resources/views/partials/_sidebar.blade.php b/resources/views/partials/_sidebar.blade.php
new file mode 100644
index 0000000..15dd8ef
--- /dev/null
+++ b/resources/views/partials/_sidebar.blade.php
@@ -0,0 +1,87 @@
+@php
+    $currentRoute = request()->route()->getName();
+@endphp
+
+<ul class="nav flex-column">
+    <li class="nav-item">
+        <a class="nav-link {{ $currentRoute === 'dashboard' ? 'active' : '' }}" href="{{ route('dashboard') }}">
+            <i class="bi bi-speedometer2"></i> Панель управления
+        </a>
+    </li>
+    @if(Auth::user()->hasRole(['Administrator', 'Manager']))
+    <li class="nav-item">
+        <a class="nav-link {{ Str::startsWith($currentRoute, 'admin.organizations') ? 'active' : '' }}" href="{{ route('admin.organizations.index') }}">
+            <i class="bi bi-building"></i> Организации
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-people"></i> Пользователи
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-book"></i> Курсы
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-file-earmark-text"></i> Тесты
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-calendar-check"></i> Назначения
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-file-earmark-spreadsheet"></i> Отчёты
+        </a>
+    </li>
+    @endif
+    @if(Auth::user()->hasRole('Curator'))
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-people"></i> Пользователи
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-people-fill"></i> Группы
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-book"></i> Курсы
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-calendar-check"></i> Назначения
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-file-earmark-spreadsheet"></i> Отчёты
+        </a>
+    </li>
+    @endif
+    @if(Auth::user()->hasRole('Student'))
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-book"></i> Мои курсы
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-file-earmark-text"></i> Тесты
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" href="#">
+            <i class="bi bi-graph-up"></i> Прогресс
+        </a>
+    </li>
+    @endif
+</ul>