From bc4dbce0da9fd0a32de001af77fa8c548ee479de Mon Sep 17 00:00:00 2001 From: Alan WhitMore Date: Mon, 19 Oct 2020 16:09:31 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Exceptions/Handler.php | 10 +++--- app/Helpers/General/HtmlHelper.php | 2 +- .../Composers/Backend/SidebarComposer.php | 2 +- .../Controllers/Api/V1/AuthController.php | 2 +- .../Api/V1/BlogCategoriesController.php | 10 +++--- .../Controllers/Api/V1/BlogTagsController.php | 10 +++--- .../Controllers/Api/V1/BlogsController.php | 10 +++--- .../Controllers/Api/V1/FaqsController.php | 10 +++--- .../Controllers/Api/V1/PagesController.php | 10 +++--- .../Permission/PermissionTableController.php | 4 +-- .../Auth/Permission/PermissionsController.php | 18 +++++------ .../Backend/Auth/Role/RoleController.php | 18 +++++------ .../Backend/Auth/Role/RoleTableController.php | 4 +-- .../Auth/User/UserAccessController.php | 4 +-- .../Auth/User/UserConfirmationController.php | 4 +-- .../Backend/Auth/User/UserController.php | 12 +++---- .../Auth/User/UserPasswordController.php | 4 +-- .../Auth/User/UserSessionController.php | 2 +- .../Auth/User/UserSocialController.php | 6 ++-- .../Auth/User/UserStatusController.php | 6 ++-- .../Backend/Auth/User/UserTableController.php | 6 ++-- .../BlogCategoriesController.php | 14 ++++---- .../BlogCategoriesTableController.php | 4 +-- .../Backend/BlogTags/BlogTagsController.php | 14 ++++---- .../BlogTags/BlogTagsTableController.php | 6 ++-- .../Backend/Blogs/BlogsController.php | 18 +++++------ .../Backend/Blogs/BlogsTableController.php | 4 +-- .../Backend/DashboardController.php | 4 +-- .../EmailTemplatesController.php | 14 ++++---- .../EmailTemplatesTableController.php | 4 +-- .../Backend/Faqs/FaqsController.php | 12 +++---- .../Backend/Faqs/FaqsTableController.php | 6 ++-- .../Backend/Pages/PagesController.php | 16 +++++----- .../Backend/Pages/PagesTableController.php | 4 +-- app/Http/Controllers/Controller.php | 4 +-- .../Auth/ConfirmAccountController.php | 2 +- .../Frontend/Auth/LoginController.php | 6 ++-- .../Auth/PasswordExpiredController.php | 2 +- .../Frontend/Auth/RegisterController.php | 4 +-- .../Frontend/Auth/ResetPasswordController.php | 8 ++--- .../Frontend/Auth/SocialLoginController.php | 8 ++--- .../Auth/UpdatePasswordController.php | 2 +- .../Frontend/ContactController.php | 4 +-- .../Frontend/User/ProfileController.php | 2 +- app/Http/Middleware/LocaleMiddleware.php | 2 +- app/Http/Middleware/PasswordExpires.php | 2 +- app/Http/Middleware/TrustProxies.php | 2 +- .../Frontend/Auth/RegisterRequest.php | 2 +- .../Frontend/User/UpdateProfileRequest.php | 2 +- .../Backend/Auth/User/UserEventListener.php | 14 ++++---- .../Frontend/Auth/UserEventListener.php | 4 +-- app/Mail/Frontend/Contact/SendContact.php | 2 +- app/Models/Auth/BaseUser.php | 12 +++---- app/Models/Auth/Permission.php | 4 +-- app/Models/Auth/Role.php | 8 ++--- .../Relationships/RoleRelationships.php | 2 +- .../Relationships/UserRelationships.php | 4 +-- app/Models/Auth/User.php | 10 +++--- app/Models/Blog.php | 4 +-- app/Models/BlogCategory.php | 4 +-- app/Models/BlogTag.php | 4 +-- app/Models/EmailTemplate.php | 4 +-- app/Models/Faq.php | 2 +- app/Models/Page.php | 4 +-- .../Relationships/BlogRelationships.php | 2 +- .../Backend/Auth/UserAccountActive.php | 2 +- .../Frontend/Auth/UserNeedsConfirmation.php | 2 +- .../Frontend/Auth/UserNeedsPasswordReset.php | 2 +- app/Providers/AppServiceProvider.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/ComposerServiceProvider.php | 4 +-- app/Providers/HelperServiceProvider.php | 4 +-- app/Providers/RouteServiceProvider.php | 2 +- .../Auth/Permission/PermissionRepository.php | 8 ++--- .../Backend/Auth/PermissionRepository.php | 8 ++--- .../Backend/Auth/RoleRepository.php | 8 ++--- .../Backend/Auth/SocialRepository.php | 6 ++-- .../Backend/Auth/UserRepository.php | 22 ++++++------- .../Backend/BlogCategoriesRepository.php | 6 ++-- .../Backend/BlogTagsRepository.php | 6 ++-- app/Repositories/Backend/BlogsRepository.php | 18 +++++------ .../Backend/EmailTemplatesRepository.php | 8 ++--- app/Repositories/Backend/FaqsRepository.php | 6 ++-- app/Repositories/Backend/PagesRepository.php | 8 ++--- .../Frontend/Auth/UserRepository.php | 12 +++---- app/Rules/Auth/UnusedPassword.php | 4 +-- config/access.php | 2 +- database/factories/BlogFactory.php | 2 +- database/factories/BlogTagFactory.php | 2 +- database/factories/PageFactory.php | 2 +- database/factories/PermissionFactory.php | 2 +- database/factories/UserFactory.php | 4 +-- .../2014_10_12_000000_create_users_table.php | 4 +-- ...12_100000_create_password_resets_table.php | 4 +-- ..._09_03_144628_create_permission_tables.php | 2 +- ...11_174816_create_social_accounts_table.php | 4 +-- .../2017_09_26_140332_create_cache_table.php | 4 +-- ...017_09_26_140528_create_sessions_table.php | 4 +-- .../2017_09_26_140609_create_jobs_table.php | 4 +-- ...02_060149_create_blog_categories_table.php | 2 +- ...60149_create_blog_map_categories_table.php | 2 +- ...1_02_060149_create_blog_map_tags_table.php | 2 +- ...17_11_02_060149_create_blog_tags_table.php | 2 +- .../2017_11_02_060149_create_blogs_table.php | 2 +- .../2017_11_02_060149_create_faqs_table.php | 2 +- .../2017_11_02_060149_create_pages_table.php | 2 +- ...033256_create_password_histories_table.php | 4 +-- ...2018_11_21_000001_create_ledgers_table.php | 4 +-- ..._08_19_000000_create_failed_jobs_table.php | 4 +-- ...11_080530_create_email_templates_table.php | 4 +-- ..._foreign_key_constraints_to_acl_tables.php | 4 +-- database/seeds/Auth/PermissionRoleSeeder.php | 2 +- database/seeds/Auth/PermissionTableSeeder.php | 4 +-- database/seeds/Auth/PermissionUserSeeder.php | 2 +- database/seeds/Auth/RoleTableSeeder.php | 4 +-- database/seeds/Auth/UserRoleTableSeeder.php | 2 +- database/seeds/Auth/UserTableSeeder.php | 6 ++-- database/seeds/AuthTableSeeder.php | 2 +- database/seeds/BlogCategoryTableSeeder.php | 2 +- database/seeds/BlogTableSeeder.php | 6 ++-- database/seeds/BlogTagTableSeeder.php | 4 +-- database/seeds/DatabaseSeeder.php | 2 +- .../EmailTemplate/EmailTemplateSeeder.php | 2 +- database/seeds/Faq/FaqTableSeeder.php | 2 +- database/seeds/Pages/PagesTableSeeder.php | 4 +-- routes/backend/auth.php | 6 ++-- routes/frontend/auth.php | 8 ++--- routes/frontend/home.php | 4 +-- tests/Feature/Api/BaseApiTestCase.php | 8 ++--- tests/Feature/Backend/AdminDashboardTest.php | 2 +- tests/Feature/Backend/Role/CreateRoleTest.php | 8 ++--- tests/Feature/Backend/Role/DeleteRoleTest.php | 6 ++-- tests/Feature/Backend/Role/ReadRoleTest.php | 2 +- tests/Feature/Backend/Role/UpdateRoleTest.php | 8 ++--- .../Backend/User/ChangeUserPasswordTest.php | 10 +++--- .../Feature/Backend/User/ClearSessionTest.php | 2 +- .../Feature/Backend/User/ConfirmUserTest.php | 10 +++--- tests/Feature/Backend/User/CreateUserTest.php | 10 +++--- .../Backend/User/DeactivateUserTest.php | 6 ++-- tests/Feature/Backend/User/DeleteUserTest.php | 8 ++--- tests/Feature/Backend/User/ReadUsersTest.php | 2 +- tests/Feature/Backend/User/UpdateUserTest.php | 10 +++--- tests/Feature/Frontend/ChangePasswordTest.php | 4 +-- .../Feature/Frontend/FillContactFormTest.php | 4 +-- .../Frontend/PasswordExpirationTest.php | 4 +-- tests/Feature/Frontend/ResetPasswordTest.php | 6 ++-- .../Frontend/UpdateUserAccountTest.php | 8 ++--- tests/Feature/Frontend/UserDashboardTest.php | 2 +- tests/Feature/Frontend/UserLoginTest.php | 8 ++--- .../Feature/Frontend/UserRegistrationTest.php | 16 +++++----- .../Middleware/CheckForReadOnlyModeTest.php | 4 +-- .../Feature/Middleware/SwitchLanguageTest.php | 2 +- tests/Unit/UserRepositoryTest.php | 32 +++++++++---------- 154 files changed, 435 insertions(+), 435 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index bd05d988..97a2d4cc 100755 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,16 +3,16 @@ namespace App\Exceptions; use Exception; -use Illuminate\Http\Response; -use Illuminate\Support\Facades\Log; -use Illuminate\Auth\AuthenticationException; -use Illuminate\Validation\ValidationException; use Illuminate\Auth\Access\AuthorizationException; +use Illuminate\Auth\AuthenticationException; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Http\Response; +use Illuminate\Support\Facades\Log; +use Illuminate\Validation\ValidationException; +use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException; -use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; /** * Class Handler. diff --git a/app/Helpers/General/HtmlHelper.php b/app/Helpers/General/HtmlHelper.php index df139dcc..2edf9e2f 100755 --- a/app/Helpers/General/HtmlHelper.php +++ b/app/Helpers/General/HtmlHelper.php @@ -2,8 +2,8 @@ namespace App\Helpers\General; -use Illuminate\Support\HtmlString; use Illuminate\Contracts\Routing\UrlGenerator; +use Illuminate\Support\HtmlString; /** * Class HtmlHelper. diff --git a/app/Http/Composers/Backend/SidebarComposer.php b/app/Http/Composers/Backend/SidebarComposer.php index 43435e8e..e7318de8 100755 --- a/app/Http/Composers/Backend/SidebarComposer.php +++ b/app/Http/Composers/Backend/SidebarComposer.php @@ -2,8 +2,8 @@ namespace App\Http\Composers\Backend; -use Illuminate\View\View; use App\Repositories\Backend\Auth\UserRepository; +use Illuminate\View\View; /** * Class SidebarComposer. diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.php index 10af2f83..747225aa 100755 --- a/app/Http/Controllers/Api/V1/AuthController.php +++ b/app/Http/Controllers/Api/V1/AuthController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\API\V1; -use Validator; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Validator; /** * @group Authentication diff --git a/app/Http/Controllers/Api/V1/BlogCategoriesController.php b/app/Http/Controllers/Api/V1/BlogCategoriesController.php index a5f78c02..5669853d 100755 --- a/app/Http/Controllers/Api/V1/BlogCategoriesController.php +++ b/app/Http/Controllers/Api/V1/BlogCategoriesController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers\Api\V1; -use App\Models\BlogCategory; -use Illuminate\Http\Response; -use App\Http\Resources\BlogCategoriesResource; -use App\Repositories\Backend\BlogCategoriesRepository; -use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\DeleteBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest; +use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest; +use App\Http\Resources\BlogCategoriesResource; +use App\Models\BlogCategory; +use App\Repositories\Backend\BlogCategoriesRepository; +use Illuminate\Http\Response; /** * @group Blog Categories Management diff --git a/app/Http/Controllers/Api/V1/BlogTagsController.php b/app/Http/Controllers/Api/V1/BlogTagsController.php index 11a8675c..649779b5 100755 --- a/app/Http/Controllers/Api/V1/BlogTagsController.php +++ b/app/Http/Controllers/Api/V1/BlogTagsController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers\Api\V1; -use App\Models\BlogTag; -use Illuminate\Http\Response; -use App\Http\Resources\BlogTagsResource; -use App\Repositories\Backend\BlogTagsRepository; -use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\DeleteBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest; +use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\UpdateBlogTagsRequest; +use App\Http\Resources\BlogTagsResource; +use App\Models\BlogTag; +use App\Repositories\Backend\BlogTagsRepository; +use Illuminate\Http\Response; /** * @group Blog Tag Management diff --git a/app/Http/Controllers/Api/V1/BlogsController.php b/app/Http/Controllers/Api/V1/BlogsController.php index 091dacf3..0a68c799 100755 --- a/app/Http/Controllers/Api/V1/BlogsController.php +++ b/app/Http/Controllers/Api/V1/BlogsController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers\Api\V1; -use App\Models\Blog; -use Illuminate\Http\Response; -use App\Http\Resources\BlogsResource; -use App\Repositories\Backend\BlogsRepository; -use App\Http\Requests\Backend\Blogs\StoreBlogsRequest; use App\Http\Requests\Backend\Blogs\DeleteBlogsRequest; use App\Http\Requests\Backend\Blogs\ManageBlogsRequest; +use App\Http\Requests\Backend\Blogs\StoreBlogsRequest; use App\Http\Requests\Backend\Blogs\UpdateBlogsRequest; +use App\Http\Resources\BlogsResource; +use App\Models\Blog; +use App\Repositories\Backend\BlogsRepository; +use Illuminate\Http\Response; /** * @group Blog Management diff --git a/app/Http/Controllers/Api/V1/FaqsController.php b/app/Http/Controllers/Api/V1/FaqsController.php index 3981fe64..2ba51fae 100755 --- a/app/Http/Controllers/Api/V1/FaqsController.php +++ b/app/Http/Controllers/Api/V1/FaqsController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers\Api\V1; -use App\Models\Faq; -use Illuminate\Http\Response; -use App\Http\Resources\FaqsResource; -use App\Repositories\Backend\FaqsRepository; -use App\Http\Requests\Backend\Faqs\StoreFaqsRequest; use App\Http\Requests\Backend\Faqs\DeleteFaqsRequest; use App\Http\Requests\Backend\Faqs\ManageFaqsRequest; +use App\Http\Requests\Backend\Faqs\StoreFaqsRequest; use App\Http\Requests\Backend\Faqs\UpdateFaqsRequest; +use App\Http\Resources\FaqsResource; +use App\Models\Faq; +use App\Repositories\Backend\FaqsRepository; +use Illuminate\Http\Response; /** * @group Faq Management diff --git a/app/Http/Controllers/Api/V1/PagesController.php b/app/Http/Controllers/Api/V1/PagesController.php index 34acc33e..bff6a9a3 100755 --- a/app/Http/Controllers/Api/V1/PagesController.php +++ b/app/Http/Controllers/Api/V1/PagesController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers\Api\V1; -use App\Models\Page; -use Illuminate\Http\Response; -use App\Http\Resources\PagesResource; -use App\Repositories\Backend\PagesRepository; -use App\Http\Requests\Backend\Pages\StorePageRequest; use App\Http\Requests\Backend\Pages\DeletePageRequest; use App\Http\Requests\Backend\Pages\ManagePageRequest; +use App\Http\Requests\Backend\Pages\StorePageRequest; use App\Http\Requests\Backend\Pages\UpdatePageRequest; +use App\Http\Resources\PagesResource; +use App\Models\Page; +use App\Repositories\Backend\PagesRepository; +use Illuminate\Http\Response; /** * @group Pages Management diff --git a/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php b/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php index 3f45d5e2..99fa0de9 100755 --- a/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php +++ b/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Backend\Auth\Permission; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\Auth\PermissionRepository; use App\Http\Requests\Backend\Auth\Permission\ManagePermissionRequest; +use App\Repositories\Backend\Auth\PermissionRepository; +use Yajra\DataTables\Facades\DataTables; /** * Class PermissionTableController. diff --git a/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php b/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php index 037d2cee..81349819 100755 --- a/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php +++ b/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php @@ -2,20 +2,20 @@ namespace App\Http\Controllers\Backend\Auth\Permission; -use App\Models\Auth\Permission; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\Auth\PermissionRepository; -use App\Http\Responses\Backend\Auth\Permission\EditResponse; -use App\Http\Responses\Backend\Auth\Permission\CreateResponse; -use App\Http\Requests\Backend\Auth\Permission\EditPermissionRequest; -use App\Http\Requests\Backend\Auth\Permission\StorePermissionRequest; use App\Http\Requests\Backend\Auth\Permission\CreatePermissionRequest; use App\Http\Requests\Backend\Auth\Permission\DeletePermissionRequest; +use App\Http\Requests\Backend\Auth\Permission\EditPermissionRequest; use App\Http\Requests\Backend\Auth\Permission\ManagePermissionRequest; +use App\Http\Requests\Backend\Auth\Permission\StorePermissionRequest; use App\Http\Requests\Backend\Auth\Permission\UpdatePermissionRequest; +use App\Http\Responses\Backend\Auth\Permission\CreateResponse; +use App\Http\Responses\Backend\Auth\Permission\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\Auth\Permission; +use App\Repositories\Backend\Auth\PermissionRepository; +use Illuminate\Support\Facades\View; class PermissionsController extends Controller { diff --git a/app/Http/Controllers/Backend/Auth/Role/RoleController.php b/app/Http/Controllers/Backend/Auth/Role/RoleController.php index 1394b777..ba90ecf5 100755 --- a/app/Http/Controllers/Backend/Auth/Role/RoleController.php +++ b/app/Http/Controllers/Backend/Auth/Role/RoleController.php @@ -2,19 +2,19 @@ namespace App\Http\Controllers\Backend\Auth\Role; -use App\Models\Auth\Role; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\Auth\RoleRepository; -use App\Http\Responses\Backend\Auth\Role\EditResponse; -use App\Repositories\Backend\Auth\PermissionRepository; use App\Http\Requests\Backend\Auth\Role\EditRoleRequest; -use App\Http\Responses\Backend\Auth\Role\CreateResponse; -use App\Http\Requests\Backend\Auth\Role\StoreRoleRequest; use App\Http\Requests\Backend\Auth\Role\ManageRoleRequest; +use App\Http\Requests\Backend\Auth\Role\StoreRoleRequest; use App\Http\Requests\Backend\Auth\Role\UpdateRoleRequest; +use App\Http\Responses\Backend\Auth\Role\CreateResponse; +use App\Http\Responses\Backend\Auth\Role\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\Auth\Role; +use App\Repositories\Backend\Auth\PermissionRepository; +use App\Repositories\Backend\Auth\RoleRepository; +use Illuminate\Support\Facades\View; class RoleController extends Controller { diff --git a/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php b/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php index 26251c33..3268a411 100755 --- a/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php +++ b/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Backend\Auth\Role; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\Auth\RoleRepository; use App\Http\Requests\Backend\Auth\Role\ManageRoleRequest; +use App\Repositories\Backend\Auth\RoleRepository; +use Yajra\DataTables\Facades\DataTables; /** * Class RoleTableController. diff --git a/app/Http/Controllers/Backend/Auth/User/UserAccessController.php b/app/Http/Controllers/Backend/Auth/User/UserAccessController.php index 878db058..06ec8e09 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserAccessController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserAccessController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; -use App\Helpers\Auth\Auth; use App\Exceptions\GeneralException; +use App\Helpers\Auth\Auth; use App\Http\Controllers\Controller; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Models\Auth\User; /** * Class UserAccessController. diff --git a/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php b/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php index fd9e7365..020356ab 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; use App\Http\Controllers\Controller; -use App\Repositories\Backend\Auth\UserRepository; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Models\Auth\User; use App\Notifications\Frontend\Auth\UserNeedsConfirmation; +use App\Repositories\Backend\Auth\UserRepository; class UserConfirmationController extends Controller { diff --git a/app/Http/Controllers/Backend/Auth/User/UserController.php b/app/Http/Controllers/Backend/Auth/User/UserController.php index 42ec7179..2126f5cc 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserController.php @@ -2,16 +2,16 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; use App\Http\Controllers\Controller; +use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Http\Requests\Backend\Auth\User\StoreUserRequest; +use App\Http\Requests\Backend\Auth\User\UpdateUserRequest; use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; +use App\Models\Auth\User; +use App\Repositories\Backend\Auth\PermissionRepository; use App\Repositories\Backend\Auth\RoleRepository; use App\Repositories\Backend\Auth\UserRepository; -use App\Repositories\Backend\Auth\PermissionRepository; -use App\Http\Requests\Backend\Auth\User\StoreUserRequest; -use App\Http\Requests\Backend\Auth\User\ManageUserRequest; -use App\Http\Requests\Backend\Auth\User\UpdateUserRequest; +use Illuminate\Support\Facades\View; class UserController extends Controller { diff --git a/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php b/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php index 9add277f..5e9fe9d1 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; use App\Http\Controllers\Controller; -use App\Repositories\Backend\Auth\UserRepository; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; use App\Http\Requests\Backend\Auth\User\UpdateUserPasswordRequest; +use App\Models\Auth\User; +use App\Repositories\Backend\Auth\UserRepository; class UserPasswordController extends Controller { diff --git a/app/Http/Controllers/Backend/Auth/User/UserSessionController.php b/app/Http/Controllers/Backend/Auth/User/UserSessionController.php index 95cfe09e..e6e34560 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserSessionController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserSessionController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; use App\Http\Controllers\Controller; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Models\Auth\User; /** * Class UserSessionController. diff --git a/app/Http/Controllers/Backend/Auth/User/UserSocialController.php b/app/Http/Controllers/Backend/Auth/User/UserSocialController.php index d46e3d22..68276819 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserSocialController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserSocialController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; -use App\Models\Auth\SocialAccount; use App\Http\Controllers\Controller; -use App\Repositories\Backend\Auth\User\SocialRepository; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Models\Auth\SocialAccount; +use App\Models\Auth\User; +use App\Repositories\Backend\Auth\User\SocialRepository; /** * Class UserSocialController. diff --git a/app/Http/Controllers/Backend/Auth/User/UserStatusController.php b/app/Http/Controllers/Backend/Auth/User/UserStatusController.php index 149122aa..21d3bd91 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserStatusController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserStatusController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Auth\User; -use App\Models\Auth\User; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\View; -use App\Repositories\Backend\Auth\UserRepository; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Models\Auth\User; +use App\Repositories\Backend\Auth\UserRepository; +use Illuminate\Support\Facades\View; /** * Class UserStatusController. diff --git a/app/Http/Controllers/Backend/Auth/User/UserTableController.php b/app/Http/Controllers/Backend/Auth/User/UserTableController.php index 532f091b..20aa7e1d 100755 --- a/app/Http/Controllers/Backend/Auth/User/UserTableController.php +++ b/app/Http/Controllers/Backend/Auth/User/UserTableController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Auth\User; -use Carbon\Carbon; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\Auth\UserRepository; use App\Http\Requests\Backend\Auth\User\ManageUserRequest; +use App\Repositories\Backend\Auth\UserRepository; +use Carbon\Carbon; +use Yajra\DataTables\Facades\DataTables; /** * Class UserTableController. diff --git a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php index b9c947e8..32872461 100755 --- a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php +++ b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Backend\BlogCategories; -use App\Models\BlogCategory; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\BlogCategoriesRepository; -use App\Http\Responses\Backend\BlogCategory\EditResponse; -use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\CreateBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\DeleteBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest; +use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest; +use App\Http\Responses\Backend\BlogCategory\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\BlogCategory; +use App\Repositories\Backend\BlogCategoriesRepository; +use Illuminate\Support\Facades\View; class BlogCategoriesController extends Controller { diff --git a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php index 060fe468..989a581f 100755 --- a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php +++ b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Backend\BlogCategories; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\BlogCategoriesRepository; use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest; +use App\Repositories\Backend\BlogCategoriesRepository; +use Yajra\DataTables\Facades\DataTables; /** * Class BlogCategoriesTableController. diff --git a/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php b/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php index ce4a2c41..00bb96c2 100755 --- a/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php +++ b/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Backend\BlogTags; -use App\Models\BlogTag; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\BlogTagsRepository; -use App\Http\Responses\Backend\BlogTag\EditResponse; -use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\CreateBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\DeleteBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest; +use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest; use App\Http\Requests\Backend\BlogTags\UpdateBlogTagsRequest; +use App\Http\Responses\Backend\BlogTag\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\BlogTag; +use App\Repositories\Backend\BlogTagsRepository; +use Illuminate\Support\Facades\View; class BlogTagsController extends Controller { diff --git a/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php b/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php index 65255aad..fd063cca 100755 --- a/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php +++ b/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\BlogTags; -use Carbon\Carbon; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\BlogTagsRepository; use App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest; +use App\Repositories\Backend\BlogTagsRepository; +use Carbon\Carbon; +use Yajra\DataTables\Facades\DataTables; class BlogTagsTableController extends Controller { diff --git a/app/Http/Controllers/Backend/Blogs/BlogsController.php b/app/Http/Controllers/Backend/Blogs/BlogsController.php index 7e9c2838..463b33cb 100755 --- a/app/Http/Controllers/Backend/Blogs/BlogsController.php +++ b/app/Http/Controllers/Backend/Blogs/BlogsController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Backend\Blogs; -use App\Models\Blog; -use App\Models\BlogTag; -use App\Models\BlogCategory; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\BlogsRepository; -use App\Http\Responses\Backend\Blog\EditResponse; -use App\Http\Requests\Backend\Blogs\StoreBlogsRequest; use App\Http\Requests\Backend\Blogs\ManageBlogsRequest; +use App\Http\Requests\Backend\Blogs\StoreBlogsRequest; use App\Http\Requests\Backend\Blogs\UpdateBlogsRequest; +use App\Http\Responses\Backend\Blog\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\Blog; +use App\Models\BlogCategory; +use App\Models\BlogTag; +use App\Repositories\Backend\BlogsRepository; +use Illuminate\Support\Facades\View; class BlogsController extends Controller { diff --git a/app/Http/Controllers/Backend/Blogs/BlogsTableController.php b/app/Http/Controllers/Backend/Blogs/BlogsTableController.php index c0297985..55c00ac1 100755 --- a/app/Http/Controllers/Backend/Blogs/BlogsTableController.php +++ b/app/Http/Controllers/Backend/Blogs/BlogsTableController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Backend\Blogs; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\BlogsRepository; use App\Http\Requests\Backend\Blogs\ManageBlogsRequest; +use App\Repositories\Backend\BlogsRepository; +use Yajra\DataTables\Facades\DataTables; /** * Class BlogsTableController. diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php index 9cb26d11..45feb9a7 100755 --- a/app/Http/Controllers/Backend/DashboardController.php +++ b/app/Http/Controllers/Backend/DashboardController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Backend; +use App\Http\Controllers\Controller; +use App\Models\Auth\Permission; use App\Models\Auth\Role; use Illuminate\Http\Request; -use App\Models\Auth\Permission; -use App\Http\Controllers\Controller; /** * Class DashboardController. diff --git a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php index 128e42dd..5df64609 100755 --- a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php +++ b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Backend\EmailTemplates; -use App\Models\EmailTemplate; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\EmailTemplatesRepository; -use App\Http\Responses\Backend\EmailTemplates\EditResponse; -use App\Http\Requests\Backend\EmailTemplates\StoreEmailTemplatesRequest; use App\Http\Requests\Backend\EmailTemplates\CreateEmailTemplatesRequest; use App\Http\Requests\Backend\EmailTemplates\DeleteEmailTemplatesRequest; use App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest; +use App\Http\Requests\Backend\EmailTemplates\StoreEmailTemplatesRequest; use App\Http\Requests\Backend\EmailTemplates\UpdateEmailTemplatesRequest; +use App\Http\Responses\Backend\EmailTemplates\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\EmailTemplate; +use App\Repositories\Backend\EmailTemplatesRepository; +use Illuminate\Support\Facades\View; class EmailTemplatesController extends Controller { diff --git a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php index bbad7d5b..60c2c2e1 100755 --- a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php +++ b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Backend\EmailTemplates; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\EmailTemplatesRepository; use App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest; +use App\Repositories\Backend\EmailTemplatesRepository; +use Yajra\DataTables\Facades\DataTables; class EmailTemplatesTableController extends Controller { diff --git a/app/Http/Controllers/Backend/Faqs/FaqsController.php b/app/Http/Controllers/Backend/Faqs/FaqsController.php index a955d021..aaa60f51 100755 --- a/app/Http/Controllers/Backend/Faqs/FaqsController.php +++ b/app/Http/Controllers/Backend/Faqs/FaqsController.php @@ -2,17 +2,17 @@ namespace App\Http\Controllers\Backend\Faqs; -use App\Models\Faq; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\FaqsRepository; -use App\Http\Requests\Backend\Faqs\StoreFaqsRequest; use App\Http\Requests\Backend\Faqs\CreateFaqsRequest; use App\Http\Requests\Backend\Faqs\DeleteFaqsRequest; use App\Http\Requests\Backend\Faqs\ManageFaqsRequest; +use App\Http\Requests\Backend\Faqs\StoreFaqsRequest; use App\Http\Requests\Backend\Faqs\UpdateFaqsRequest; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\Faq; +use App\Repositories\Backend\FaqsRepository; +use Illuminate\Support\Facades\View; class FaqsController extends Controller { diff --git a/app/Http/Controllers/Backend/Faqs/FaqsTableController.php b/app/Http/Controllers/Backend/Faqs/FaqsTableController.php index bcb602cd..f6f82519 100755 --- a/app/Http/Controllers/Backend/Faqs/FaqsTableController.php +++ b/app/Http/Controllers/Backend/Faqs/FaqsTableController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Backend\Faqs; -use Carbon\Carbon; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\FaqsRepository; use App\Http\Requests\Backend\Faqs\ManageFaqsRequest; +use App\Repositories\Backend\FaqsRepository; +use Carbon\Carbon; +use Yajra\DataTables\Facades\DataTables; class FaqsTableController extends Controller { diff --git a/app/Http/Controllers/Backend/Pages/PagesController.php b/app/Http/Controllers/Backend/Pages/PagesController.php index b22bf686..2add6333 100755 --- a/app/Http/Controllers/Backend/Pages/PagesController.php +++ b/app/Http/Controllers/Backend/Pages/PagesController.php @@ -2,19 +2,19 @@ namespace App\Http\Controllers\Backend\Pages; -use App\Models\Page; use App\Http\Controllers\Controller; -use App\Http\Responses\ViewResponse; -use Illuminate\Support\Facades\View; -use App\Http\Responses\RedirectResponse; -use App\Repositories\Backend\PagesRepository; -use App\Http\Responses\Backend\Page\EditResponse; -use App\Http\Requests\Backend\Pages\EditPageRequest; -use App\Http\Requests\Backend\Pages\StorePageRequest; use App\Http\Requests\Backend\Pages\CreatePageRequest; use App\Http\Requests\Backend\Pages\DeletePageRequest; +use App\Http\Requests\Backend\Pages\EditPageRequest; use App\Http\Requests\Backend\Pages\ManagePageRequest; +use App\Http\Requests\Backend\Pages\StorePageRequest; use App\Http\Requests\Backend\Pages\UpdatePageRequest; +use App\Http\Responses\Backend\Page\EditResponse; +use App\Http\Responses\RedirectResponse; +use App\Http\Responses\ViewResponse; +use App\Models\Page; +use App\Repositories\Backend\PagesRepository; +use Illuminate\Support\Facades\View; class PagesController extends Controller { diff --git a/app/Http/Controllers/Backend/Pages/PagesTableController.php b/app/Http/Controllers/Backend/Pages/PagesTableController.php index fa40c8e2..16c3043a 100755 --- a/app/Http/Controllers/Backend/Pages/PagesTableController.php +++ b/app/Http/Controllers/Backend/Pages/PagesTableController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Backend\Pages; use App\Http\Controllers\Controller; -use Yajra\DataTables\Facades\DataTables; -use App\Repositories\Backend\PagesRepository; use App\Http\Requests\Backend\Pages\ManagePageRequest; +use App\Repositories\Backend\PagesRepository; +use Yajra\DataTables\Facades\DataTables; class PagesTableController extends Controller { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b93e380c..0298f1e3 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; -use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Routing\Controller as BaseController; /** * Class Controller. diff --git a/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php b/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php index 6609a11e..63ee4fa9 100755 --- a/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php +++ b/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Frontend\Auth; use App\Http\Controllers\Controller; -use App\Repositories\Frontend\Auth\UserRepository; use App\Notifications\Frontend\Auth\UserNeedsConfirmation; +use App\Repositories\Frontend\Auth\UserRepository; /** * Class ConfirmAccountController. diff --git a/app/Http/Controllers/Frontend/Auth/LoginController.php b/app/Http/Controllers/Frontend/Auth/LoginController.php index 67a29580..0d07fcfa 100755 --- a/app/Http/Controllers/Frontend/Auth/LoginController.php +++ b/app/Http/Controllers/Frontend/Auth/LoginController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers\Frontend\Auth; -use Illuminate\Http\Request; -use App\Exceptions\GeneralException; -use App\Http\Controllers\Controller; use App\Events\Frontend\Auth\UserLoggedIn; use App\Events\Frontend\Auth\UserLoggedOut; +use App\Exceptions\GeneralException; +use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\AuthenticatesUsers; +use Illuminate\Http\Request; use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules; /** diff --git a/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php b/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php index 003672f9..6c2dc92a 100755 --- a/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php +++ b/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Frontend\Auth; use App\Http\Controllers\Controller; -use App\Repositories\Frontend\Auth\UserRepository; use App\Http\Requests\Frontend\User\UpdatePasswordRequest; +use App\Repositories\Frontend\Auth\UserRepository; /** * Class PasswordExpiredController. diff --git a/app/Http/Controllers/Frontend/Auth/RegisterController.php b/app/Http/Controllers/Frontend/Auth/RegisterController.php index 3fa357b6..e9dae2b0 100755 --- a/app/Http/Controllers/Frontend/Auth/RegisterController.php +++ b/app/Http/Controllers/Frontend/Auth/RegisterController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Frontend\Auth; +use App\Events\Frontend\Auth\UserRegistered; use App\Http\Controllers\Controller; use App\Http\Requests\RegisterRequest; -use App\Events\Frontend\Auth\UserRegistered; -use Illuminate\Foundation\Auth\RegistersUsers; use App\Repositories\Frontend\Auth\UserRepository; +use Illuminate\Foundation\Auth\RegistersUsers; /** * Class RegisterController. diff --git a/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php b/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php index e11ccdc4..1fb1a361 100755 --- a/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers\Frontend\Auth; -use Illuminate\Support\Str; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Password; +use App\Http\Requests\Frontend\Auth\ResetPasswordRequest; +use App\Repositories\Frontend\Auth\UserRepository; use Illuminate\Auth\Events\PasswordReset; use Illuminate\Foundation\Auth\ResetsPasswords; -use App\Repositories\Frontend\Auth\UserRepository; -use App\Http\Requests\Frontend\Auth\ResetPasswordRequest; +use Illuminate\Support\Facades\Password; +use Illuminate\Support\Str; /** * Class ResetPasswordController. diff --git a/app/Http/Controllers/Frontend/Auth/SocialLoginController.php b/app/Http/Controllers/Frontend/Auth/SocialLoginController.php index 80a5e293..26777c10 100755 --- a/app/Http/Controllers/Frontend/Auth/SocialLoginController.php +++ b/app/Http/Controllers/Frontend/Auth/SocialLoginController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers\Frontend\Auth; -use Illuminate\Http\Request; +use App\Events\Frontend\Auth\UserLoggedIn; use App\Exceptions\GeneralException; -use App\Http\Controllers\Controller; use App\Helpers\Auth\SocialiteHelper; -use Laravel\Socialite\Facades\Socialite; -use App\Events\Frontend\Auth\UserLoggedIn; +use App\Http\Controllers\Controller; use App\Repositories\Frontend\Auth\UserRepository; +use Illuminate\Http\Request; +use Laravel\Socialite\Facades\Socialite; /** * Class SocialLoginController. diff --git a/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php b/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php index ae2efa75..3483ee41 100755 --- a/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php +++ b/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Frontend\Auth; use App\Http\Controllers\Controller; -use App\Repositories\Frontend\Auth\UserRepository; use App\Http\Requests\Frontend\User\UpdatePasswordRequest; +use App\Repositories\Frontend\Auth\UserRepository; /** * Class UpdatePasswordController. diff --git a/app/Http/Controllers/Frontend/ContactController.php b/app/Http/Controllers/Frontend/ContactController.php index f280e7d5..689ba0b9 100755 --- a/app/Http/Controllers/Frontend/ContactController.php +++ b/app/Http/Controllers/Frontend/ContactController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Frontend; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Mail; -use App\Mail\Frontend\Contact\SendContact; use App\Http\Requests\Frontend\Contact\SendContactRequest; +use App\Mail\Frontend\Contact\SendContact; +use Illuminate\Support\Facades\Mail; /** * Class ContactController. diff --git a/app/Http/Controllers/Frontend/User/ProfileController.php b/app/Http/Controllers/Frontend/User/ProfileController.php index bd2ab6fe..658c167f 100755 --- a/app/Http/Controllers/Frontend/User/ProfileController.php +++ b/app/Http/Controllers/Frontend/User/ProfileController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Frontend\User; use App\Http\Controllers\Controller; -use App\Repositories\Frontend\Auth\UserRepository; use App\Http\Requests\Frontend\User\UpdateProfileRequest; +use App\Repositories\Frontend\Auth\UserRepository; /** * Class ProfileController. diff --git a/app/Http/Middleware/LocaleMiddleware.php b/app/Http/Middleware/LocaleMiddleware.php index 20b3e2cb..4e3b02b8 100755 --- a/app/Http/Middleware/LocaleMiddleware.php +++ b/app/Http/Middleware/LocaleMiddleware.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Closure; use Carbon\Carbon; +use Closure; /** * Class LocaleMiddleware. diff --git a/app/Http/Middleware/PasswordExpires.php b/app/Http/Middleware/PasswordExpires.php index eaee7fc7..63cb48f8 100755 --- a/app/Http/Middleware/PasswordExpires.php +++ b/app/Http/Middleware/PasswordExpires.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Closure; use Carbon\Carbon; +use Closure; /** * Class PasswordExpired. diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index cf22797d..663bcb2c 100755 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Illuminate\Http\Request; use Fideloper\Proxy\TrustProxies as Middleware; +use Illuminate\Http\Request; /** * Class TrustProxies. diff --git a/app/Http/Requests/Frontend/Auth/RegisterRequest.php b/app/Http/Requests/Frontend/Auth/RegisterRequest.php index efe2d648..2773c589 100755 --- a/app/Http/Requests/Frontend/Auth/RegisterRequest.php +++ b/app/Http/Requests/Frontend/Auth/RegisterRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Validation\Rule; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules; /** diff --git a/app/Http/Requests/Frontend/User/UpdateProfileRequest.php b/app/Http/Requests/Frontend/User/UpdateProfileRequest.php index f641c929..bc3cba70 100755 --- a/app/Http/Requests/Frontend/User/UpdateProfileRequest.php +++ b/app/Http/Requests/Frontend/User/UpdateProfileRequest.php @@ -2,9 +2,9 @@ namespace App\Http\Requests\Frontend\User; -use Illuminate\Validation\Rule; use App\Helpers\Auth\SocialiteHelper; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; /** * Class UpdateProfileRequest. diff --git a/app/Listeners/Backend/Auth/User/UserEventListener.php b/app/Listeners/Backend/Auth/User/UserEventListener.php index 734a144f..8a053626 100755 --- a/app/Listeners/Backend/Auth/User/UserEventListener.php +++ b/app/Listeners/Backend/Auth/User/UserEventListener.php @@ -2,17 +2,17 @@ namespace App\Listeners\Backend\Auth\User; -use App\Events\Backend\Auth\User\UserCreated; -use App\Events\Backend\Auth\User\UserDeleted; -use App\Events\Backend\Auth\User\UserUpdated; -use App\Events\Backend\Auth\User\UserRestored; use App\Events\Backend\Auth\User\UserConfirmed; +use App\Events\Backend\Auth\User\UserCreated; use App\Events\Backend\Auth\User\UserDeactivated; -use App\Events\Backend\Auth\User\UserReactivated; -use App\Events\Backend\Auth\User\UserUnconfirmed; -use App\Events\Backend\Auth\User\UserSocialDeleted; +use App\Events\Backend\Auth\User\UserDeleted; use App\Events\Backend\Auth\User\UserPasswordChanged; use App\Events\Backend\Auth\User\UserPermanentlyDeleted; +use App\Events\Backend\Auth\User\UserReactivated; +use App\Events\Backend\Auth\User\UserRestored; +use App\Events\Backend\Auth\User\UserSocialDeleted; +use App\Events\Backend\Auth\User\UserUnconfirmed; +use App\Events\Backend\Auth\User\UserUpdated; /** * Class UserEventListener. diff --git a/app/Listeners/Frontend/Auth/UserEventListener.php b/app/Listeners/Frontend/Auth/UserEventListener.php index ac86d8e1..31e9239b 100755 --- a/app/Listeners/Frontend/Auth/UserEventListener.php +++ b/app/Listeners/Frontend/Auth/UserEventListener.php @@ -2,11 +2,11 @@ namespace App\Listeners\Frontend\Auth; -use App\Events\Frontend\Auth\UserLoggedIn; use App\Events\Frontend\Auth\UserConfirmed; +use App\Events\Frontend\Auth\UserLoggedIn; use App\Events\Frontend\Auth\UserLoggedOut; -use App\Events\Frontend\Auth\UserRegistered; use App\Events\Frontend\Auth\UserProviderRegistered; +use App\Events\Frontend\Auth\UserRegistered; /** * Class UserEventListener. diff --git a/app/Mail/Frontend/Contact/SendContact.php b/app/Mail/Frontend/Contact/SendContact.php index 24f1bb04..d56e5c08 100755 --- a/app/Mail/Frontend/Contact/SendContact.php +++ b/app/Mail/Frontend/Contact/SendContact.php @@ -2,8 +2,8 @@ namespace App\Mail\Frontend\Contact; -use Illuminate\Http\Request; use Illuminate\Bus\Queueable; +use Illuminate\Http\Request; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Models/Auth/BaseUser.php b/app/Models/Auth/BaseUser.php index 67d7189d..ab29dc3f 100755 --- a/app/Models/Auth/BaseUser.php +++ b/app/Models/Auth/BaseUser.php @@ -2,15 +2,15 @@ namespace App\Models\Auth; -use App\Models\Traits\Uuid; -use Altek\Eventually\Eventually; -use Illuminate\Notifications\Notifiable; use Altek\Accountant\Contracts\Recordable; -use Lab404\Impersonate\Models\Impersonate; -use Illuminate\Database\Eloquent\SoftDeletes; -use App\Models\Auth\Traits\SendUserPasswordReset; use Altek\Accountant\Recordable as RecordableTrait; +use Altek\Eventually\Eventually; +use App\Models\Auth\Traits\SendUserPasswordReset; +use App\Models\Traits\Uuid; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; +use Lab404\Impersonate\Models\Impersonate; abstract class BaseUser extends Authenticatable implements Recordable { diff --git a/app/Models/Auth/Permission.php b/app/Models/Auth/Permission.php index 4c6fc70b..5f14596d 100755 --- a/app/Models/Auth/Permission.php +++ b/app/Models/Auth/Permission.php @@ -2,11 +2,11 @@ namespace App\Models\Auth; +use App\Models\Auth\Traits\Attributes\PermissionAttributes; +use App\Models\Auth\Traits\Relationships\PermissionRelationships; use App\Models\BaseModel; use App\Models\Traits\ModelAttributes; use Illuminate\Database\Eloquent\SoftDeletes; -use App\Models\Auth\Traits\Attributes\PermissionAttributes; -use App\Models\Auth\Traits\Relationships\PermissionRelationships; /** * Class Permission. diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php index 2ef0bed7..95ef91a9 100755 --- a/app/Models/Auth/Role.php +++ b/app/Models/Auth/Role.php @@ -2,13 +2,13 @@ namespace App\Models\Auth; -use App\Models\BaseModel; -use App\Models\Traits\ModelAttributes; use App\Models\Auth\Traits\Access\RoleAccess; -use App\Models\Auth\Traits\Scopes\RoleScopes; -use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Auth\Traits\Attributes\RoleAttributes; use App\Models\Auth\Traits\Relationships\RoleRelationships; +use App\Models\Auth\Traits\Scopes\RoleScopes; +use App\Models\BaseModel; +use App\Models\Traits\ModelAttributes; +use Illuminate\Database\Eloquent\SoftDeletes; class Role extends BaseModel { diff --git a/app/Models/Auth/Traits/Relationships/RoleRelationships.php b/app/Models/Auth/Traits/Relationships/RoleRelationships.php index 02fd35eb..a7784b01 100755 --- a/app/Models/Auth/Traits/Relationships/RoleRelationships.php +++ b/app/Models/Auth/Traits/Relationships/RoleRelationships.php @@ -2,8 +2,8 @@ namespace App\Models\Auth\Traits\Relationships; -use App\Models\Auth\User; use App\Models\Auth\Permission; +use App\Models\Auth\User; trait RoleRelationships { diff --git a/app/Models/Auth/Traits/Relationships/UserRelationships.php b/app/Models/Auth/Traits/Relationships/UserRelationships.php index 3a4edf6d..4f3a2bf7 100755 --- a/app/Models/Auth/Traits/Relationships/UserRelationships.php +++ b/app/Models/Auth/Traits/Relationships/UserRelationships.php @@ -2,10 +2,10 @@ namespace App\Models\Auth\Traits\Relationships; -use App\Models\Auth\Role; +use App\Models\Auth\PasswordHistory; use App\Models\Auth\Permission; +use App\Models\Auth\Role; use App\Models\Auth\SocialAccount; -use App\Models\Auth\PasswordHistory; trait UserRelationships { diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 16005ffa..6ddce897 100755 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -2,14 +2,14 @@ namespace App\Models\Auth; -use Laravel\Passport\HasApiTokens; -use Illuminate\Notifications\Notifiable; use App\Models\Auth\Traits\Access\UserAccess; -use App\Models\Auth\Traits\Scopes\UserScopes; -use Illuminate\Database\Eloquent\SoftDeletes; -use App\Models\Auth\Traits\Methods\UserMethods; use App\Models\Auth\Traits\Attributes\UserAttributes; +use App\Models\Auth\Traits\Methods\UserMethods; use App\Models\Auth\Traits\Relationships\UserRelationships; +use App\Models\Auth\Traits\Scopes\UserScopes; +use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Notifications\Notifiable; +use Laravel\Passport\HasApiTokens; /** * Class User. diff --git a/app/Models/Blog.php b/app/Models/Blog.php index c2194db9..1ec5ed4c 100755 --- a/app/Models/Blog.php +++ b/app/Models/Blog.php @@ -2,10 +2,10 @@ namespace App\Models; -use App\Models\Traits\ModelAttributes; -use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Traits\Attributes\BlogAttributes; +use App\Models\Traits\ModelAttributes; use App\Models\Traits\Relationships\BlogRelationships; +use Illuminate\Database\Eloquent\SoftDeletes; class Blog extends BaseModel { diff --git a/app/Models/BlogCategory.php b/app/Models/BlogCategory.php index dc2d643e..654de442 100755 --- a/app/Models/BlogCategory.php +++ b/app/Models/BlogCategory.php @@ -2,10 +2,10 @@ namespace App\Models; -use App\Models\Traits\ModelAttributes; -use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Traits\Attributes\BlogCategoryAttributes; +use App\Models\Traits\ModelAttributes; use App\Models\Traits\Relationships\BlogCategoryRelationships; +use Illuminate\Database\Eloquent\SoftDeletes; class BlogCategory extends BaseModel { diff --git a/app/Models/BlogTag.php b/app/Models/BlogTag.php index 1f70970e..ef5b4861 100755 --- a/app/Models/BlogTag.php +++ b/app/Models/BlogTag.php @@ -2,10 +2,10 @@ namespace App\Models; -use App\Models\Traits\ModelAttributes; -use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Traits\Attributes\BlogTagAttributes; +use App\Models\Traits\ModelAttributes; use App\Models\Traits\Relationships\BlogTagRelationships; +use Illuminate\Database\Eloquent\SoftDeletes; class BlogTag extends BaseModel { diff --git a/app/Models/EmailTemplate.php b/app/Models/EmailTemplate.php index 53e571fb..671d2af6 100755 --- a/app/Models/EmailTemplate.php +++ b/app/Models/EmailTemplate.php @@ -2,10 +2,10 @@ namespace App\Models; -use App\Models\Traits\ModelAttributes; -use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Traits\Attributes\EmailTemplateAttributes; +use App\Models\Traits\ModelAttributes; use App\Models\Traits\Relationships\EmailTemplateRelationships; +use Illuminate\Database\Eloquent\SoftDeletes; class EmailTemplate extends BaseModel { diff --git a/app/Models/Faq.php b/app/Models/Faq.php index 4d4cc0a6..3e69292e 100755 --- a/app/Models/Faq.php +++ b/app/Models/Faq.php @@ -2,9 +2,9 @@ namespace App\Models; +use App\Models\Traits\Attributes\FaqAttributes; use App\Models\Traits\ModelAttributes; use Illuminate\Database\Eloquent\SoftDeletes; -use App\Models\Traits\Attributes\FaqAttributes; class Faq extends BaseModel { diff --git a/app/Models/Page.php b/app/Models/Page.php index ef9ce947..55a6045f 100755 --- a/app/Models/Page.php +++ b/app/Models/Page.php @@ -2,10 +2,10 @@ namespace App\Models; -use App\Models\Traits\ModelAttributes; -use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Traits\Attributes\PageAttributes; +use App\Models\Traits\ModelAttributes; use App\Models\Traits\Relationships\PageRelationships; +use Illuminate\Database\Eloquent\SoftDeletes; class Page extends BaseModel { diff --git a/app/Models/Traits/Relationships/BlogRelationships.php b/app/Models/Traits/Relationships/BlogRelationships.php index 98b86339..bed18cbc 100755 --- a/app/Models/Traits/Relationships/BlogRelationships.php +++ b/app/Models/Traits/Relationships/BlogRelationships.php @@ -2,9 +2,9 @@ namespace App\Models\Traits\Relationships; -use App\Models\BlogTag; use App\Models\Auth\User; use App\Models\BlogCategory; +use App\Models\BlogTag; trait BlogRelationships { diff --git a/app/Notifications/Backend/Auth/UserAccountActive.php b/app/Notifications/Backend/Auth/UserAccountActive.php index 7d50dc2a..6d457bbe 100755 --- a/app/Notifications/Backend/Auth/UserAccountActive.php +++ b/app/Notifications/Backend/Auth/UserAccountActive.php @@ -3,8 +3,8 @@ namespace App\Notifications\Backend\Auth; use Illuminate\Bus\Queueable; -use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; /** * Class UserAccountActive. diff --git a/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php b/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php index 9d56edba..4d27d676 100755 --- a/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php +++ b/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php @@ -3,8 +3,8 @@ namespace App\Notifications\Frontend\Auth; use Illuminate\Bus\Queueable; -use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; /** * Class UserNeedsConfirmation. diff --git a/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php b/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php index 8483a5d0..0eecee4d 100755 --- a/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php +++ b/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php @@ -3,8 +3,8 @@ namespace App\Notifications\Frontend\Auth; use Illuminate\Bus\Queueable; -use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; /** * Class UserNeedsPasswordReset. diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 7346145a..099dd199 100755 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Carbon\Carbon; use App\Services\Access; +use Carbon\Carbon; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index beb05902..a3cb5c1d 100755 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -3,8 +3,8 @@ namespace App\Providers; use Gate; -use Laravel\Passport\Passport; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Laravel\Passport\Passport; /** * Class AuthServiceProvider. diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 3fda7719..fd4445a3 100755 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Broadcast; +use Illuminate\Support\ServiceProvider; /** * Class BroadcastServiceProvider. diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 7c6026c2..a2b92f94 100755 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -2,10 +2,10 @@ namespace App\Providers; -use Illuminate\Support\Facades\View; +use App\Http\Composers\Backend\SidebarComposer; use App\Http\Composers\GlobalComposer; +use Illuminate\Support\Facades\View; use Illuminate\Support\ServiceProvider; -use App\Http\Composers\Backend\SidebarComposer; /** * Class ComposerServiceProvider. diff --git a/app/Providers/HelperServiceProvider.php b/app/Providers/HelperServiceProvider.php index e2846ba7..75815e93 100755 --- a/app/Providers/HelperServiceProvider.php +++ b/app/Providers/HelperServiceProvider.php @@ -2,9 +2,9 @@ namespace App\Providers; -use RecursiveIteratorIterator; -use RecursiveDirectoryIterator; use Illuminate\Support\ServiceProvider; +use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; /** * Class HelperServiceProvider. diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 8739f444..bad7921a 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -3,9 +3,9 @@ namespace App\Providers; use App\Models\Auth\User; +use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Routing\Router; use Illuminate\Support\Facades\Route; -use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; /** * Class RouteServiceProvider. diff --git a/app/Repositories/Backend/Auth/Permission/PermissionRepository.php b/app/Repositories/Backend/Auth/Permission/PermissionRepository.php index 15c99f26..eb112fbd 100755 --- a/app/Repositories/Backend/Auth/Permission/PermissionRepository.php +++ b/app/Repositories/Backend/Auth/Permission/PermissionRepository.php @@ -2,13 +2,13 @@ namespace App\Repositories\Backend\Auth\Permission; -use DB; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; -use App\Models\Auth\Permission\Permission; use App\Events\Backend\Auth\Permission\PermissionCreated; use App\Events\Backend\Auth\Permission\PermissionDeleted; use App\Events\Backend\Auth\Permission\PermissionUpdated; +use App\Exceptions\GeneralException; +use App\Models\Auth\Permission\Permission; +use App\Repositories\BaseRepository; +use DB; /** * Class PermissionRepository. diff --git a/app/Repositories/Backend/Auth/PermissionRepository.php b/app/Repositories/Backend/Auth/PermissionRepository.php index 0ecc778a..f8ba9d60 100755 --- a/app/Repositories/Backend/Auth/PermissionRepository.php +++ b/app/Repositories/Backend/Auth/PermissionRepository.php @@ -2,13 +2,13 @@ namespace App\Repositories\Backend\Auth; -use DB; -use App\Models\Auth\Permission; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\Auth\Permission\PermissionCreated; use App\Events\Backend\Auth\Permission\PermissionDeleted; use App\Events\Backend\Auth\Permission\PermissionUpdated; +use App\Exceptions\GeneralException; +use App\Models\Auth\Permission; +use App\Repositories\BaseRepository; +use DB; class PermissionRepository extends BaseRepository { diff --git a/app/Repositories/Backend/Auth/RoleRepository.php b/app/Repositories/Backend/Auth/RoleRepository.php index 29e1a532..82818e50 100755 --- a/app/Repositories/Backend/Auth/RoleRepository.php +++ b/app/Repositories/Backend/Auth/RoleRepository.php @@ -2,13 +2,13 @@ namespace App\Repositories\Backend\Auth; -use DB; -use App\Models\Auth\Role; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\Auth\Role\RoleCreated; use App\Events\Backend\Auth\Role\RoleDeleted; use App\Events\Backend\Auth\Role\RoleUpdated; +use App\Exceptions\GeneralException; +use App\Models\Auth\Role; +use App\Repositories\BaseRepository; +use DB; class RoleRepository extends BaseRepository { diff --git a/app/Repositories/Backend/Auth/SocialRepository.php b/app/Repositories/Backend/Auth/SocialRepository.php index d1686bde..a0b5d91b 100755 --- a/app/Repositories/Backend/Auth/SocialRepository.php +++ b/app/Repositories/Backend/Auth/SocialRepository.php @@ -2,10 +2,10 @@ namespace App\Repositories\Backend\Auth\User; -use App\Models\Auth\User; -use App\Models\Auth\SocialAccount; -use App\Exceptions\GeneralException; use App\Events\Backend\Auth\User\UserSocialDeleted; +use App\Exceptions\GeneralException; +use App\Models\Auth\SocialAccount; +use App\Models\Auth\User; class SocialRepository { diff --git a/app/Repositories/Backend/Auth/UserRepository.php b/app/Repositories/Backend/Auth/UserRepository.php index daf8767a..c233b8cf 100755 --- a/app/Repositories/Backend/Auth/UserRepository.php +++ b/app/Repositories/Backend/Auth/UserRepository.php @@ -2,23 +2,23 @@ namespace App\Repositories\Backend\Auth; -use App\Models\Auth\User; -use Illuminate\Support\Facades\DB; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; -use App\Events\Backend\Auth\User\UserCreated; -use App\Events\Backend\Auth\User\UserDeleted; -use App\Events\Backend\Auth\User\UserUpdated; -use App\Events\Backend\Auth\User\UserRestored; use App\Events\Backend\Auth\User\UserConfirmed; -use Illuminate\Pagination\LengthAwarePaginator; +use App\Events\Backend\Auth\User\UserCreated; use App\Events\Backend\Auth\User\UserDeactivated; +use App\Events\Backend\Auth\User\UserDeleted; +use App\Events\Backend\Auth\User\UserPasswordChanged; +use App\Events\Backend\Auth\User\UserPermanentlyDeleted; use App\Events\Backend\Auth\User\UserReactivated; +use App\Events\Backend\Auth\User\UserRestored; use App\Events\Backend\Auth\User\UserUnconfirmed; -use App\Events\Backend\Auth\User\UserPasswordChanged; +use App\Events\Backend\Auth\User\UserUpdated; +use App\Exceptions\GeneralException; +use App\Models\Auth\User; use App\Notifications\Backend\Auth\UserAccountActive; -use App\Events\Backend\Auth\User\UserPermanentlyDeleted; use App\Notifications\Frontend\Auth\UserNeedsConfirmation; +use App\Repositories\BaseRepository; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Facades\DB; /** * Class UserRepository. diff --git a/app/Repositories/Backend/BlogCategoriesRepository.php b/app/Repositories/Backend/BlogCategoriesRepository.php index ca161dae..c30cdb97 100755 --- a/app/Repositories/Backend/BlogCategoriesRepository.php +++ b/app/Repositories/Backend/BlogCategoriesRepository.php @@ -2,12 +2,12 @@ namespace App\Repositories\Backend; -use App\Models\BlogCategory; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\BlogCategories\BlogCategoryCreated; use App\Events\Backend\BlogCategories\BlogCategoryDeleted; use App\Events\Backend\BlogCategories\BlogCategoryUpdated; +use App\Exceptions\GeneralException; +use App\Models\BlogCategory; +use App\Repositories\BaseRepository; class BlogCategoriesRepository extends BaseRepository { diff --git a/app/Repositories/Backend/BlogTagsRepository.php b/app/Repositories/Backend/BlogTagsRepository.php index e243ad2c..4f9966b2 100755 --- a/app/Repositories/Backend/BlogTagsRepository.php +++ b/app/Repositories/Backend/BlogTagsRepository.php @@ -2,12 +2,12 @@ namespace App\Repositories\Backend; -use App\Models\BlogTag; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\BlogTags\BlogTagCreated; use App\Events\Backend\BlogTags\BlogTagDeleted; use App\Events\Backend\BlogTags\BlogTagUpdated; +use App\Exceptions\GeneralException; +use App\Models\BlogTag; +use App\Repositories\BaseRepository; class BlogTagsRepository extends BaseRepository { diff --git a/app/Repositories/Backend/BlogsRepository.php b/app/Repositories/Backend/BlogsRepository.php index e8154918..9d29b002 100755 --- a/app/Repositories/Backend/BlogsRepository.php +++ b/app/Repositories/Backend/BlogsRepository.php @@ -2,20 +2,20 @@ namespace App\Repositories\Backend; -use DB; -use Carbon\Carbon; +use App\Events\Backend\Blogs\BlogCreated; +use App\Events\Backend\Blogs\BlogDeleted; +use App\Events\Backend\Blogs\BlogUpdated; +use App\Exceptions\GeneralException; use App\Models\Blog; -use App\Models\BlogTag; -use App\Models\BlogMapTag; -use Illuminate\Support\Str; use App\Models\BlogCategory; use App\Models\BlogMapCategory; -use App\Exceptions\GeneralException; +use App\Models\BlogMapTag; +use App\Models\BlogTag; use App\Repositories\BaseRepository; +use Carbon\Carbon; +use DB; use Illuminate\Support\Facades\Storage; -use App\Events\Backend\Blogs\BlogCreated; -use App\Events\Backend\Blogs\BlogDeleted; -use App\Events\Backend\Blogs\BlogUpdated; +use Illuminate\Support\Str; class BlogsRepository extends BaseRepository { diff --git a/app/Repositories/Backend/EmailTemplatesRepository.php b/app/Repositories/Backend/EmailTemplatesRepository.php index 3b9fd149..e75a36ee 100755 --- a/app/Repositories/Backend/EmailTemplatesRepository.php +++ b/app/Repositories/Backend/EmailTemplatesRepository.php @@ -2,13 +2,13 @@ namespace App\Repositories\Backend; -use Str; -use App\Models\EmailTemplate; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\EmailTemplates\EmailTemplateCreated; use App\Events\Backend\EmailTemplates\EmailTemplateDeleted; use App\Events\Backend\EmailTemplates\EmailTemplateUpdated; +use App\Exceptions\GeneralException; +use App\Models\EmailTemplate; +use App\Repositories\BaseRepository; +use Str; class EmailTemplatesRepository extends BaseRepository { diff --git a/app/Repositories/Backend/FaqsRepository.php b/app/Repositories/Backend/FaqsRepository.php index 6b221a22..cb6a263f 100755 --- a/app/Repositories/Backend/FaqsRepository.php +++ b/app/Repositories/Backend/FaqsRepository.php @@ -2,12 +2,12 @@ namespace App\Repositories\Backend; -use App\Models\Faq; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\Faqs\FaqCreated; use App\Events\Backend\Faqs\FaqDeleted; use App\Events\Backend\Faqs\FaqUpdated; +use App\Exceptions\GeneralException; +use App\Models\Faq; +use App\Repositories\BaseRepository; class FaqsRepository extends BaseRepository { diff --git a/app/Repositories/Backend/PagesRepository.php b/app/Repositories/Backend/PagesRepository.php index b3d2a1bd..2c40a81a 100755 --- a/app/Repositories/Backend/PagesRepository.php +++ b/app/Repositories/Backend/PagesRepository.php @@ -2,13 +2,13 @@ namespace App\Repositories\Backend; -use App\Models\Page; -use Illuminate\Support\Str; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use App\Events\Backend\Pages\PageCreated; use App\Events\Backend\Pages\PageDeleted; use App\Events\Backend\Pages\PageUpdated; +use App\Exceptions\GeneralException; +use App\Models\Page; +use App\Repositories\BaseRepository; +use Illuminate\Support\Str; class PagesRepository extends BaseRepository { diff --git a/app/Repositories/Frontend/Auth/UserRepository.php b/app/Repositories/Frontend/Auth/UserRepository.php index 2f0c7ff1..79b29bcf 100755 --- a/app/Repositories/Frontend/Auth/UserRepository.php +++ b/app/Repositories/Frontend/Auth/UserRepository.php @@ -2,18 +2,18 @@ namespace App\Repositories\Frontend\Auth; +use App\Events\Frontend\Auth\UserConfirmed; +use App\Events\Frontend\Auth\UserProviderRegistered; +use App\Exceptions\GeneralException; use App\Models\Auth\Role; +use App\Models\Auth\SocialAccount; use App\Models\Auth\User; +use App\Notifications\Frontend\Auth\UserNeedsConfirmation; +use App\Repositories\BaseRepository; use Illuminate\Http\UploadedFile; -use App\Models\Auth\SocialAccount; use Illuminate\Support\Facades\DB; -use App\Exceptions\GeneralException; -use App\Repositories\BaseRepository; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Storage; -use App\Events\Frontend\Auth\UserConfirmed; -use App\Events\Frontend\Auth\UserProviderRegistered; -use App\Notifications\Frontend\Auth\UserNeedsConfirmation; /** * Class UserRepository. diff --git a/app/Rules/Auth/UnusedPassword.php b/app/Rules/Auth/UnusedPassword.php index c0201d34..4dbfd7d2 100755 --- a/app/Rules/Auth/UnusedPassword.php +++ b/app/Rules/Auth/UnusedPassword.php @@ -3,10 +3,10 @@ namespace App\Rules\Auth; use App\Models\Auth\User; -use Illuminate\Support\Facades\Hash; -use Illuminate\Contracts\Validation\Rule; use App\Repositories\Backend\Auth\UserRepository as BackendUserRepository; use App\Repositories\Frontend\Auth\UserRepository as FrontendUserRepository; +use Illuminate\Contracts\Validation\Rule; +use Illuminate\Support\Facades\Hash; /** * Class UnusedPassword. diff --git a/config/access.php b/config/access.php index 00b089d1..a07b0816 100755 --- a/config/access.php +++ b/config/access.php @@ -1,7 +1,7 @@ define(Blog::class, function (Faker $faker) { diff --git a/database/factories/BlogTagFactory.php b/database/factories/BlogTagFactory.php index f705d0ee..9112614a 100644 --- a/database/factories/BlogTagFactory.php +++ b/database/factories/BlogTagFactory.php @@ -2,8 +2,8 @@ /** @var \Illuminate\Database\Eloquent\Factory $factory */ -use App\Models\BlogTag; use App\Models\Auth\User; +use App\Models\BlogTag; use Faker\Generator as Faker; $factory->define(BlogTag::class, function (Faker $faker) { diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php index b3e0f883..e9355d55 100644 --- a/database/factories/PageFactory.php +++ b/database/factories/PageFactory.php @@ -2,8 +2,8 @@ /** @var \Illuminate\Database\Eloquent\Factory $factory */ -use App\Models\Page; use App\Models\Auth\User; +use App\Models\Page; use Faker\Generator as Faker; $factory->define(Page::class, function (Faker $faker) { diff --git a/database/factories/PermissionFactory.php b/database/factories/PermissionFactory.php index 874950f9..282054f9 100755 --- a/database/factories/PermissionFactory.php +++ b/database/factories/PermissionFactory.php @@ -1,7 +1,7 @@ define(Permission::class, function (Faker $faker) { $name = $faker->name(); diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index dadd6c6d..101ffc74 100755 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,9 +1,9 @@