diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php index d7def638a..91897148c 100644 --- a/app/Http/Controllers/Admin/MenuController.php +++ b/app/Http/Controllers/Admin/MenuController.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin; use App\Models\Menu; use Illuminate\Http\Request; -use App\Http\Controllers\BasePageController; use Spatie\Permission\Models\Role; +use App\Http\Controllers\BasePageController; class MenuController extends BasePageController { diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index a3cbb1943..f8fe0f2d2 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -3,11 +3,10 @@ namespace App\Http\Controllers\Admin; use App\Models\Category; -use App\Models\UserRole; use Illuminate\Http\Request; +use Spatie\Permission\Models\Role; use App\Models\RoleExcludedCategory; use App\Http\Controllers\BasePageController; -use Spatie\Permission\Models\Role; class RoleController extends BasePageController { diff --git a/app/Http/Controllers/Admin/SiteController.php b/app/Http/Controllers/Admin/SiteController.php index 4675abaaf..e84d244ea 100644 --- a/app/Http/Controllers/Admin/SiteController.php +++ b/app/Http/Controllers/Admin/SiteController.php @@ -10,8 +10,8 @@ use App\Models\Category; use App\Models\Settings; use Illuminate\Http\Request; use Blacklight\utility\Utility; -use App\Http\Controllers\BasePageController; use Spatie\Permission\Models\Role; +use App\Http\Controllers\BasePageController; class SiteController extends BasePageController { diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 7da93cfb9..6cb0cbbfd 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -6,9 +6,9 @@ use App\Models\User; use App\Models\Invitation; use App\Mail\AccountChange; use Illuminate\Http\Request; +use Spatie\Permission\Models\Role; use Illuminate\Support\Facades\Mail; use App\Http\Controllers\BasePageController; -use Spatie\Permission\Models\Role; class UserController extends BasePageController { diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index a769fd0bb..d906bd4cc 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -8,13 +8,13 @@ use App\Models\Invitation; use Illuminate\Support\Str; use Illuminate\Http\Request; use Blacklight\utility\Utility; +use Spatie\Permission\Models\Role; use App\Http\Controllers\Controller; use Illuminate\Auth\Events\Registered; use Illuminate\Support\Facades\Password; use Illuminate\Foundation\Auth\RegistersUsers; use Jrean\UserVerification\Traits\VerifiesUsers; use Jrean\UserVerification\Facades\UserVerification; -use Spatie\Permission\Models\Role; class RegisterController extends Controller { diff --git a/app/Models/RoleExcludedCategory.php b/app/Models/RoleExcludedCategory.php index adaef4507..d987a1e0a 100644 --- a/app/Models/RoleExcludedCategory.php +++ b/app/Models/RoleExcludedCategory.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; use Spatie\Permission\Models\Role; +use Illuminate\Database\Eloquent\Model; /** * App\Models\RoleExcludedCategory.