Feat: CRUD групп пользователей
✅ GroupUserController (index, show, edit, update, destroy) ✅ Маршруты: /admin/groups ✅ Blade шаблоны: index, show, edit ✅ Управление пользователями в группах ✅ Исправлена подсветка сайдбара (Курсы/Тесты) ✅ Ссылка на Группы в сайдбаре для Curator Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad
parent
5da8134eae
commit
d27b631c8f
|
|
@ -0,0 +1,92 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Group;
|
||||
use App\Models\User;
|
||||
use App\Models\Organization;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class GroupUserController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function index(Request $request)
|
||||
{
|
||||
Gate::authorize('viewAny', Group::class);
|
||||
|
||||
$query = Group::with(['organization', 'users']);
|
||||
|
||||
if ($request->filled('organization_id')) {
|
||||
$query->where('organization_id', $request->organization_id);
|
||||
}
|
||||
|
||||
$groups = $query->orderBy('name')->paginate(20);
|
||||
$organizations = Organization::pluck('name', 'id');
|
||||
|
||||
return view('admin.groups.index', compact('groups', 'organizations'));
|
||||
}
|
||||
|
||||
public function show(Group $group)
|
||||
{
|
||||
Gate::authorize('view', $group);
|
||||
|
||||
$group->load(['organization', 'users']);
|
||||
$users = User::where('organization_id', $group->organization_id)->get();
|
||||
|
||||
return view('admin.groups.show', compact('group', 'users'));
|
||||
}
|
||||
|
||||
public function edit(Group $group)
|
||||
{
|
||||
Gate::authorize('update', $group);
|
||||
|
||||
$group->load(['organization', 'users']);
|
||||
$users = User::where('organization_id', $group->organization_id)->get();
|
||||
|
||||
return view('admin.groups.edit', compact('group', 'users'));
|
||||
}
|
||||
|
||||
public function update(Request $request, Group $group)
|
||||
{
|
||||
Gate::authorize('update', $group);
|
||||
|
||||
$validated = $request->validate([
|
||||
'name' => 'required|string|max:255',
|
||||
'description' => 'nullable|string',
|
||||
'is_active' => 'boolean',
|
||||
'users' => 'nullable|array',
|
||||
'users.*' => 'exists:users,id',
|
||||
]);
|
||||
|
||||
$group->update($validated);
|
||||
|
||||
// Синхронизируем пользователей в группе
|
||||
if (isset($validated['users'])) {
|
||||
$group->users()->sync($validated['users']);
|
||||
}
|
||||
|
||||
return redirect()->route('admin.groups.show', $group)
|
||||
->with('success', 'Группа успешно обновлена.');
|
||||
}
|
||||
|
||||
public function destroy(Group $group)
|
||||
{
|
||||
Gate::authorize('delete', $group);
|
||||
|
||||
if ($group->users()->count() > 0) {
|
||||
return back()->with('error', 'Нельзя удалить группу с пользователями. Сначала удалите пользователей из группы.');
|
||||
}
|
||||
|
||||
$group->delete();
|
||||
|
||||
return redirect()->route('admin.groups.index')
|
||||
->with('success', 'Группа успешно удалена.');
|
||||
}
|
||||
}
|
||||
|
|
@ -1,95 +1,64 @@
|
|||
@extends('layouts.app')
|
||||
|
||||
@section('title', 'Редактировать группу')
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
|
||||
<div class="position-sticky pt-3">
|
||||
@include('partials._sidebar')
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
|
||||
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
|
||||
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<h1 class="h2">Редактировать группу</h1>
|
||||
<a href="{{ route('admin.organizations.show', $organization) }}" class="btn btn-secondary btn-sm">
|
||||
<i class="bi bi-arrow-left"></i> Назад к организации
|
||||
</a>
|
||||
<a href="{{ route('admin.groups.show', $group) }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</div>
|
||||
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<ul class="mb-0">
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<form action="{{ route('admin.organizations.groups.update', [$organization, $group]) }}" method="POST">
|
||||
@csrf
|
||||
@method('PUT')
|
||||
|
||||
<form action="{{ route('admin.groups.update', $group) }}" method="POST">
|
||||
@csrf @method('PUT')
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<div class="card shadow-sm mb-4">
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header bg-primary text-white"><h5 class="mb-0">Основная информация</h5></div>
|
||||
<div class="card-body">
|
||||
<h5 class="card-title mb-3">Основная информация</h5>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="name" class="form-label">Название группы <span class="text-danger">*</span></label>
|
||||
<input type="text" class="form-control @error('name') is-invalid @enderror"
|
||||
id="name" name="name" value="{{ old('name', $group->name) }}" required autofocus>
|
||||
@error('name')
|
||||
<div class="invalid-feedback">{{ $message }}</div>
|
||||
@enderror
|
||||
<label class="form-label">Название группы *</label>
|
||||
<input type="text" name="name" class="form-control @error('name') is-invalid @enderror" value="{{ old('name', $group->name) }}" required>
|
||||
@error('name')<div class="invalid-feedback">{{ $message }}</div>@enderror
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="description" class="form-label">Описание</label>
|
||||
<textarea class="form-control @error('description') is-invalid @enderror"
|
||||
id="description" name="description" rows="3">{{ old('description', $group->description) }}</textarea>
|
||||
@error('description')
|
||||
<div class="invalid-feedback">{{ $message }}</div>
|
||||
@enderror
|
||||
<label class="form-label">Описание</label>
|
||||
<textarea name="description" class="form-control" rows="3">{{ old('description', $group->description) }}</textarea>
|
||||
</div>
|
||||
|
||||
<div class="mb-3 form-check">
|
||||
<input type="checkbox" class="form-check-input" id="is_active" name="is_active" value="1" {{ old('is_active', $group->is_active) ? 'checked' : '' }}>
|
||||
<label class="form-check-label" for="is_active">Активна</label>
|
||||
<div class="form-check mb-3">
|
||||
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', $group->is_active) ? 'checked' : '' }}>
|
||||
<label class="form-check-label">Активна</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm mb-4">
|
||||
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header bg-success text-white"><h5 class="mb-0">Пользователи в группе</h5></div>
|
||||
<div class="card-body">
|
||||
<h5 class="card-title mb-3">Организация</h5>
|
||||
<p class="text-muted mb-0">{{ $organization->name }}</p>
|
||||
@if($organization->inn)
|
||||
<p class="text-muted small">ИНН: {{ $organization->inn }}</p>
|
||||
@endif
|
||||
<hr>
|
||||
<p class="text-muted small mb-0">
|
||||
Создана: {{ $group->created_at->format('d.m.Y') }}<br>
|
||||
Обновлена: {{ $group->updated_at->format('d.m.Y') }}
|
||||
</p>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Добавить/удалить пользователей</label>
|
||||
<div style="max-height: 400px; overflow-y: auto;" class="border rounded p-2">
|
||||
@foreach($users as $user)
|
||||
<div class="form-check">
|
||||
<input type="checkbox" name="users[]" value="{{ $user->id }}" class="form-check-input" id="user_{{ $user->id }}" {{ $group->users->contains($user->id) ? 'checked' : '' }}>
|
||||
<label class="form-check-label" for="user_{{ $user->id }}">
|
||||
{{ $user->name }} ({{ $user->email }})
|
||||
</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
<small class="text-muted">Отметьте пользователей для добавления в группу</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
<i class="bi bi-check-lg"></i> Сохранить изменения
|
||||
</button>
|
||||
<a href="{{ route('admin.organizations.show', $organization) }}" class="btn btn-secondary">
|
||||
<i class="bi bi-x-lg"></i> Отмена
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary">Сохранить</button>
|
||||
<a href="{{ route('admin.groups.show', $group) }}" class="btn btn-secondary">Отмена</a>
|
||||
</form>
|
||||
</main>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,54 +1,42 @@
|
|||
@extends('layouts.app')
|
||||
|
||||
@section('title', 'Группы организации')
|
||||
|
||||
@section('title', 'Группы пользователей')
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
|
||||
<div class="position-sticky pt-3">
|
||||
@include('partials._sidebar')
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
|
||||
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
|
||||
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<h1 class="h2">Группы организации</h1>
|
||||
<div class="btn-toolbar">
|
||||
<a href="{{ route('admin.organizations.show', $organization) }}" class="btn btn-secondary btn-sm me-2">
|
||||
<i class="bi bi-arrow-left"></i> К организации
|
||||
</a>
|
||||
@can('create', App\Models\Group::class)
|
||||
<a href="{{ route('admin.groups.create', $organization) }}" class="btn btn-primary btn-sm">
|
||||
<i class="bi bi-plus-lg"></i> Добавить группу
|
||||
</a>
|
||||
@endcan
|
||||
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<h1 class="h2">Группы пользователей</h1>
|
||||
</div>
|
||||
@if(session('success'))<div class="alert alert-success">{{ session('success') }}</div>@endif
|
||||
@if(session('error'))<div class="alert alert-danger">{{ session('error') }}</div>@endif
|
||||
|
||||
<div class="card shadow-sm mb-4">
|
||||
<div class="card-body">
|
||||
<form action="{{ route('admin.groups.index') }}" method="GET" class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<select name="organization_id" class="form-select">
|
||||
<option value="">Все организации</option>
|
||||
@foreach($organizations as $id => $name)
|
||||
<option value="{{ $id }}" {{ request('organization_id') == $id ? 'selected' : '' }}>{{ $name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<button type="submit" class="btn btn-primary w-100"><i class="bi bi-search"></i></button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if(session('success'))
|
||||
<div class="alert alert-success alert-dismissible fade show" role="alert">
|
||||
<i class="bi bi-check-circle"></i> {{ session('success') }}
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(session('error'))
|
||||
<div class="alert alert-danger alert-dismissible fade show" role="alert">
|
||||
<i class="bi bi-exclamation-triangle"></i> {{ session('error') }}
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Название</th>
|
||||
<th>Описание</th>
|
||||
<th>Организация</th>
|
||||
<th>Пользователей</th>
|
||||
<th>Статус</th>
|
||||
<th>Действия</th>
|
||||
|
|
@ -57,10 +45,9 @@
|
|||
<tbody>
|
||||
@forelse($groups as $group)
|
||||
<tr>
|
||||
<td>{{ $group->id }}</td>
|
||||
<td><strong>{{ $group->name }}</strong></td>
|
||||
<td>{{ Str::limit($group->description, 50) ?? '—' }}</td>
|
||||
<td>{{ $group->users_count }}</td>
|
||||
<td>{{ $group->organization?->name ?? '—' }}</td>
|
||||
<td><span class="badge bg-info">{{ $group->users->count() }}</span></td>
|
||||
<td>
|
||||
@if($group->is_active)
|
||||
<span class="badge bg-success">Активна</span>
|
||||
|
|
@ -70,28 +57,20 @@
|
|||
</td>
|
||||
<td>
|
||||
<div class="btn-group btn-group-sm">
|
||||
@can('update', $group)
|
||||
<a href="{{ route('admin.groups.edit', $group) }}" class="btn btn-outline-warning" title="Редактировать">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</a>
|
||||
@endcan
|
||||
@can('delete', $group)
|
||||
<form action="{{ route('admin.groups.destroy', $group) }}" method="POST" class="d-inline" onsubmit="return confirm('Вы уверены?')">
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
<button type="submit" class="btn btn-outline-danger" title="Удалить">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
<a href="{{ route('admin.groups.show', $group) }}" class="btn btn-outline-primary" title="Просмотр"><i class="bi bi-eye"></i></a>
|
||||
<a href="{{ route('admin.groups.edit', $group) }}" class="btn btn-outline-warning" title="Редактировать"><i class="bi bi-pencil"></i></a>
|
||||
<form action="{{ route('admin.groups.destroy', $group) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить?')">
|
||||
@csrf @method('DELETE')
|
||||
<button class="btn btn-outline-danger" title="Удалить"><i class="bi bi-trash"></i></button>
|
||||
</form>
|
||||
@endcan
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="6" class="text-center text-muted py-4">
|
||||
<i class="bi bi-inbox" style="font-size: 2rem;"></i>
|
||||
<p class="mt-2">В этой организации пока нет групп</p>
|
||||
<td colspan="5" class="text-center text-muted py-5">
|
||||
<i class="bi bi-inbox" style="font-size: 3rem;"></i>
|
||||
<p class="mt-3">Групп пока нет</p>
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
|
|
@ -100,12 +79,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if($groups->hasPages())
|
||||
<div class="mt-3">
|
||||
{{ $groups->links() }}
|
||||
</div>
|
||||
@endif
|
||||
{{ $groups->links() }}
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,106 +1,58 @@
|
|||
@extends('layouts.app')
|
||||
|
||||
@section('title', $group->name)
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
|
||||
<div class="position-sticky pt-3">
|
||||
@include('partials._sidebar')
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
|
||||
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
|
||||
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<h1 class="h2">{{ $group->name }}</h1>
|
||||
<div class="btn-toolbar">
|
||||
@can('update', $group)
|
||||
<a href="{{ route('admin.organizations.groups.edit', [$organization, $group]) }}" class="btn btn-warning btn-sm me-2">
|
||||
<i class="bi bi-pencil"></i> Редактировать
|
||||
</a>
|
||||
@endcan
|
||||
<a href="{{ route('admin.organizations.show', $organization) }}" class="btn btn-secondary btn-sm">
|
||||
<i class="bi bi-arrow-left"></i> Назад
|
||||
</a>
|
||||
<div>
|
||||
<a href="{{ route('admin.groups.edit', $group) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>
|
||||
<a href="{{ route('admin.groups.index') }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if(session('success'))
|
||||
<div class="alert alert-success">
|
||||
<i class="bi bi-check-circle"></i> {{ session('success') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="card shadow-sm h-100">
|
||||
<div class="card-header bg-primary text-white">
|
||||
<h5 class="mb-0"><i class="bi bi-info-circle"></i> Информация</h5>
|
||||
</div>
|
||||
<div class="col-md-4 mb-4">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header bg-primary text-white"><h5 class="mb-0">Информация</h5></div>
|
||||
<div class="card-body">
|
||||
<table class="table table-sm">
|
||||
<tr>
|
||||
<th width="40%">Название:</th>
|
||||
<td>{{ $group->name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Описание:</th>
|
||||
<td>{{ $group->description ?? '—' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Статус:</th>
|
||||
<td>
|
||||
@if($group->is_active)
|
||||
<span class="badge bg-success">Активна</span>
|
||||
@else
|
||||
<span class="badge bg-secondary">Не активна</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Организация:</th>
|
||||
<td>
|
||||
<a href="{{ route('admin.organizations.show', $organization) }}">{{ $organization->name }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Создана:</th>
|
||||
<td>{{ $group->created_at->format('d.m.Y H:i') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Обновлена:</th>
|
||||
<td>{{ $group->updated_at->format('d.m.Y H:i') }}</td>
|
||||
</tr>
|
||||
<tr><th>Организация:</th><td>{{ $group->organization?->name ?? '—' }}</td></tr>
|
||||
<tr><th>Описание:</th><td>{{ $group->description ?? '—' }}</td></tr>
|
||||
<tr><th>Статус:</th><td>@if($group->is_active)<span class="badge bg-success">Активна</span>@else<span class="badge bg-secondary">Не активна</span>@endif</td></tr>
|
||||
<tr><th>Создана:</th><td>{{ $group->created_at->format('d.m.Y') }}</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="card shadow-sm h-100">
|
||||
<div class="card-header bg-success text-white">
|
||||
<h5 class="mb-0"><i class="bi bi-people-fill"></i> Пользователи</h5>
|
||||
</div>
|
||||
|
||||
<div class="col-md-8 mb-4">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header bg-success text-white"><h5 class="mb-0">Пользователи в группе ({{ $group->users->count() }})</h5></div>
|
||||
<div class="card-body">
|
||||
<div class="display-4 text-success mb-3">{{ $group->users->count() }}</div>
|
||||
<p class="text-muted">пользователей в группе</p>
|
||||
|
||||
@if($group->users->count() > 0)
|
||||
<hr>
|
||||
<ul class="list-group list-group-flush">
|
||||
@foreach($group->users->take(10) as $user)
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
{{ $user->name }}
|
||||
<small class="text-muted">{{ $user->email }}</small>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@if($group->users->count() > 10)
|
||||
<div class="mt-2 text-muted small">
|
||||
+ ещё {{ $group->users->count() - 10 }} пользователей
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Имя</th>
|
||||
<th>Email</th>
|
||||
<th>Должность</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($group->users as $user)
|
||||
<tr>
|
||||
<td>{{ $user->name }}</td>
|
||||
<td>{{ $user->email }}</td>
|
||||
<td>{{ $user->getRoleNames()->first() ?? '—' }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
@else
|
||||
<p class="text-muted mb-0">В этой группе пока нет пользователей</p>
|
||||
@endif
|
||||
|
|
@ -108,19 +60,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header">
|
||||
<h5 class="mb-0"><i class="bi bi-calendar-check"></i> Назначения курсов</h5>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<p class="text-muted mb-0">Функционал назначений курсов будет доступен в следующем обновлении.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.courses') ? 'active' : '' }}" href="{{ route('admin.courses.index') }}">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.courses.') && !Str::startsWith($currentRoute, 'admin.courses.tests') ? 'active' : '' }}" href="{{ route('admin.courses.index') }}">
|
||||
<i class="bi bi-book"></i> Курсы
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.organizations.groups') ? 'active' : '' }}" href="{{ route('admin.organizations.index') }}">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.groups') ? 'active' : '' }}" href="{{ route('admin.groups.index') }}">
|
||||
<i class="bi bi-people-fill"></i> Группы
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ use App\Http\Controllers\Admin\CourseController;
|
|||
use App\Http\Controllers\Admin\TestController;
|
||||
use App\Http\Controllers\Admin\QuestionController;
|
||||
use App\Http\Controllers\Admin\CourseAssignmentController;
|
||||
use App\Http\Controllers\Admin\GroupUserController;
|
||||
use App\Http\Controllers\DashboardController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
|
|
@ -48,5 +49,6 @@ Route::middleware('auth')->group(function () {
|
|||
Route::resource('courses.tests', TestController::class);
|
||||
Route::resource('tests.questions', QuestionController::class);
|
||||
Route::resource('course-assignments', CourseAssignmentController::class);
|
||||
Route::resource('groups', GroupUserController::class)->except(['create', 'store']);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue