Fix:

- Исправлены маршруты групп (admin.organizations.groups.*)
- Вынесен сайдбар в partial (_sidebar.blade.php)
- Добавлена ссылка на Отчёты в сайдбар
- Обновлены все шаблоны для использования partial

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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">
+                @include('partials._sidebar')
-                    <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>
             </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

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">
+                @include('partials._sidebar')
-                    <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>
             </div>
         </nav>
 

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>