Update Metronic Version to 8.2.1 #1
@ -25,7 +25,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'filename' => null,
|
'filename' => 'laravel.log',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
@ -76,18 +76,6 @@
|
|||||||
<!--end::Javascript-->
|
<!--end::Javascript-->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@if(Session::has('success'))
|
|
||||||
toastr.success("{{ Session::get('success') }}");
|
|
||||||
@endif
|
|
||||||
@if(Session::has('error'))
|
|
||||||
toastr.error("{{ Session::get('error') }}");
|
|
||||||
@endif
|
|
||||||
@if($errors->any())
|
|
||||||
@foreach($errors->all() as $error)
|
|
||||||
toastr.error("{{ $error }}");
|
|
||||||
@endforeach
|
|
||||||
@endif
|
|
||||||
|
|
||||||
document.addEventListener('livewire:load', () => {
|
document.addEventListener('livewire:load', () => {
|
||||||
Livewire.on('success', (message) => {
|
Livewire.on('success', (message) => {
|
||||||
toastr.success(message);
|
toastr.success(message);
|
||||||
|
@ -55,58 +55,6 @@
|
|||||||
<!--end:Menu content-->
|
<!--end:Menu content-->
|
||||||
</div>
|
</div>
|
||||||
<!--end:Menu item-->
|
<!--end:Menu item-->
|
||||||
<!--begin:Menu item-->
|
|
||||||
<div data-kt-menu-trigger="click" class="menu-item menu-accordion {{ request()->routeIs('user-management.*') ? 'here show' : '' }}">
|
|
||||||
<!--begin:Menu link-->
|
|
||||||
<span class="menu-link">
|
|
||||||
<span class="menu-icon">{!! getIcon('abstract-28', 'fs-2') !!}</span>
|
|
||||||
<span class="menu-title">User Management</span>
|
|
||||||
<span class="menu-arrow"></span>
|
|
||||||
</span>
|
|
||||||
<!--end:Menu link-->
|
|
||||||
<!--begin:Menu sub-->
|
|
||||||
<div class="menu-sub menu-sub-accordion">
|
|
||||||
<!--begin:Menu item-->
|
|
||||||
<div class="menu-item">
|
|
||||||
<!--begin:Menu link-->
|
|
||||||
<a class="menu-link {{ request()->routeIs('user-management.users.*') ? 'active' : '' }}" href="{{ route('user-management.users.index') }}">
|
|
||||||
<span class="menu-bullet">
|
|
||||||
<span class="bullet bullet-dot"></span>
|
|
||||||
</span>
|
|
||||||
<span class="menu-title">Users</span>
|
|
||||||
</a>
|
|
||||||
<!--end:Menu link-->
|
|
||||||
</div>
|
|
||||||
<!--end:Menu item-->
|
|
||||||
<!--begin:Menu item-->
|
|
||||||
<div class="menu-item">
|
|
||||||
<!--begin:Menu link-->
|
|
||||||
<a class="menu-link {{ request()->routeIs('user-management.roles.*') ? 'active' : '' }}" href="{{ route('user-management.roles.index') }}">
|
|
||||||
<span class="menu-bullet">
|
|
||||||
<span class="bullet bullet-dot"></span>
|
|
||||||
</span>
|
|
||||||
<span class="menu-title">Roles</span>
|
|
||||||
</a>
|
|
||||||
<!--end:Menu link-->
|
|
||||||
</div>
|
|
||||||
<!--end:Menu item-->
|
|
||||||
<!--begin:Menu item-->
|
|
||||||
<div class="menu-item">
|
|
||||||
<!--begin:Menu link-->
|
|
||||||
<a class="menu-link {{ request()->routeIs('user-management.permissions.*') ? 'active' : '' }}" href="{{ route('user-management.permissions.index') }}">
|
|
||||||
<span class="menu-bullet">
|
|
||||||
<span class="bullet bullet-dot"></span>
|
|
||||||
</span>
|
|
||||||
<span class="menu-title">Permissions</span>
|
|
||||||
</a>
|
|
||||||
<!--end:Menu link-->
|
|
||||||
</div>
|
|
||||||
<!--end:Menu item-->
|
|
||||||
</div>
|
|
||||||
<!--end:Menu sub-->
|
|
||||||
</div>
|
|
||||||
<!--end:Menu item-->
|
|
||||||
|
|
||||||
@foreach($module as $row => $key)
|
@foreach($module as $row => $key)
|
||||||
@if($key)
|
@if($key)
|
||||||
@if(file_exists(dirname(__FILE__, 4) . '/Modules/'.$row.'/Resources/views/partials/menu/_app.blade.php'))
|
@if(file_exists(dirname(__FILE__, 4) . '/Modules/'.$row.'/Resources/views/partials/menu/_app.blade.php'))
|
||||||
|
@ -1,53 +1,65 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Diglactic\Breadcrumbs\Breadcrumbs;
|
use Diglactic\Breadcrumbs\Breadcrumbs;
|
||||||
use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
|
use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
|
||||||
use Spatie\Permission\Models\Role;
|
use Spatie\Permission\Models\Role;
|
||||||
|
|
||||||
// Home
|
// Home
|
||||||
Breadcrumbs::for('home', function (BreadcrumbTrail $trail) {
|
Breadcrumbs::for('home', function (BreadcrumbTrail $trail) {
|
||||||
$trail->push('Home', route('dashboard'));
|
$trail->push('Home', route('dashboard'));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard
|
// Home > Dashboard
|
||||||
Breadcrumbs::for('dashboard', function (BreadcrumbTrail $trail) {
|
Breadcrumbs::for('dashboard', function (BreadcrumbTrail $trail) {
|
||||||
$trail->parent('home');
|
$trail->parent('home');
|
||||||
$trail->push('Dashboard', route('dashboard'));
|
$trail->push('Dashboard', route('dashboard'));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard > User Management
|
// Home > Dashboard > User Management
|
||||||
Breadcrumbs::for('user-management.index', function (BreadcrumbTrail $trail) {
|
Breadcrumbs::for('user-management.index', function (BreadcrumbTrail $trail) {
|
||||||
$trail->parent('dashboard');
|
$trail->parent('dashboard');
|
||||||
$trail->push('User Management', route('user-management.users.index'));
|
$trail->push('User Management', route('user-management.users.index'));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard > User Management > Users
|
// Home > Dashboard > User Management > Users
|
||||||
Breadcrumbs::for('user-management.users.index', function (BreadcrumbTrail $trail) {
|
Breadcrumbs::for('user-management.users.index', function (BreadcrumbTrail $trail) {
|
||||||
$trail->parent('user-management.index');
|
$trail->parent('user-management.index');
|
||||||
$trail->push('Users', route('user-management.users.index'));
|
$trail->push('Users', route('user-management.users.index'));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard > User Management > Users > [User]
|
// Home > Dashboard > User Management > Users > [User]
|
||||||
Breadcrumbs::for('user-management.users.show', function (BreadcrumbTrail $trail, User $user) {
|
Breadcrumbs::for('user-management.users.show', function (BreadcrumbTrail $trail, User $user) {
|
||||||
$trail->parent('user-management.users.index');
|
$trail->parent('user-management.users.index');
|
||||||
$trail->push(ucwords($user->name), route('user-management.users.show', $user));
|
$trail->push(ucwords($user->name), route('user-management.users.show', $user));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard > User Management > Roles
|
// Home > Dashboard > User Management > Roles
|
||||||
Breadcrumbs::for('user-management.roles.index', function (BreadcrumbTrail $trail) {
|
Breadcrumbs::for('user-management.roles.index', function (BreadcrumbTrail $trail) {
|
||||||
$trail->parent('user-management.index');
|
$trail->parent('user-management.index');
|
||||||
$trail->push('Roles', route('user-management.roles.index'));
|
$trail->push('Roles', route('user-management.roles.index'));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard > User Management > Roles > [Role]
|
// Home > Dashboard > User Management > Roles > [Role]
|
||||||
Breadcrumbs::for('user-management.roles.show', function (BreadcrumbTrail $trail, Role $role) {
|
Breadcrumbs::for('user-management.roles.show', function (BreadcrumbTrail $trail, Role $role) {
|
||||||
$trail->parent('user-management.roles.index');
|
$trail->parent('user-management.roles.index');
|
||||||
$trail->push(ucwords($role->name), route('user-management.roles.show', $role));
|
$trail->push(ucwords($role->name), route('user-management.roles.show', $role));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Home > Dashboard > User Management > Permission
|
// Home > Dashboard > User Management > Permission
|
||||||
Breadcrumbs::for('user-management.permissions.index', function (BreadcrumbTrail $trail) {
|
Breadcrumbs::for('user-management.permissions.index', function (BreadcrumbTrail $trail) {
|
||||||
$trail->parent('user-management.index');
|
$trail->parent('user-management.index');
|
||||||
$trail->push('Permissions', route('user-management.permissions.index'));
|
$trail->push('Permissions', route('user-management.permissions.index'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$route = explode('.', Route::currentRouteName());
|
||||||
|
$modules = file_get_contents(dirname(__FILE__, 2) . '/modules_statuses.json');
|
||||||
|
$module = json_decode($modules);
|
||||||
|
|
||||||
|
foreach ($module as $row => $key) {
|
||||||
|
if ($key) {
|
||||||
|
if (file_exists(dirname(__FILE__, 2) . '/Modules/' . $row . '/Routes/breadcrumbs.php')) {
|
||||||
|
include(dirname(__FILE__, 2) . '/Modules/' . $row . '/Routes/breadcrumbs.php');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Controllers\Apps\PermissionManagementController;
|
|
||||||
use App\Http\Controllers\Apps\RoleManagementController;
|
|
||||||
use App\Http\Controllers\Apps\UserManagementController;
|
|
||||||
use App\Http\Controllers\Auth\SocialiteController;
|
use App\Http\Controllers\Auth\SocialiteController;
|
||||||
use App\Http\Controllers\DashboardController;
|
use App\Http\Controllers\DashboardController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
@ -24,12 +21,6 @@ Route::middleware(['auth', 'verified'])->group(function () {
|
|||||||
|
|
||||||
Route::get('/dashboard', [DashboardController::class, 'index'])->name('dashboard');
|
Route::get('/dashboard', [DashboardController::class, 'index'])->name('dashboard');
|
||||||
|
|
||||||
Route::name('user-management.')->group(function () {
|
|
||||||
Route::resource('/user-management/users', UserManagementController::class);
|
|
||||||
Route::resource('/user-management/roles', RoleManagementController::class);
|
|
||||||
Route::resource('/user-management/permissions', PermissionManagementController::class);
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::get('/error', function () {
|
Route::get('/error', function () {
|
||||||
|
Loading…
Reference in New Issue
Block a user