From e9afd79b106af74517aabbae0c8d7fc55b6f2750 Mon Sep 17 00:00:00 2001 From: fl Date: Thu, 20 Jan 2022 17:19:33 +0700 Subject: [PATCH 1/3] lint code --- README.md | 2 +- .../views/components/atoms/sidebar/menu-dropdown-item.blade.php | 2 +- resources/views/components/atoms/sidebar/menu-item.blade.php | 2 +- .../views/components/molecules/sidebar/menu-list.blade.php | 2 +- resources/views/layouts/admin-layout.blade.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 35b6742..15d8736 100755 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ - [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) ### Javascript -- [vuejs/petite-vue](https://github.com/vuejs/petite-vue) \ No newline at end of file +- [vuejs/petite-vue](https://github.com/vuejs/petite-vue) diff --git a/resources/views/components/atoms/sidebar/menu-dropdown-item.blade.php b/resources/views/components/atoms/sidebar/menu-dropdown-item.blade.php index ca6bd0d..befc45e 100755 --- a/resources/views/components/atoms/sidebar/menu-dropdown-item.blade.php +++ b/resources/views/components/atoms/sidebar/menu-dropdown-item.blade.php @@ -19,4 +19,4 @@ @endforeach - @endif \ No newline at end of file + @endif diff --git a/resources/views/components/atoms/sidebar/menu-item.blade.php b/resources/views/components/atoms/sidebar/menu-item.blade.php index 8413a35..11c4a3a 100755 --- a/resources/views/components/atoms/sidebar/menu-item.blade.php +++ b/resources/views/components/atoms/sidebar/menu-item.blade.php @@ -5,4 +5,4 @@ {{ $name }} - @endif \ No newline at end of file + @endif diff --git a/resources/views/components/molecules/sidebar/menu-list.blade.php b/resources/views/components/molecules/sidebar/menu-list.blade.php index 84dd330..69a7f60 100755 --- a/resources/views/components/molecules/sidebar/menu-list.blade.php +++ b/resources/views/components/molecules/sidebar/menu-list.blade.php @@ -13,4 +13,4 @@ @endif @endforeach -@endif \ No newline at end of file +@endif diff --git a/resources/views/layouts/admin-layout.blade.php b/resources/views/layouts/admin-layout.blade.php index f3a4761..66ca25f 100755 --- a/resources/views/layouts/admin-layout.blade.php +++ b/resources/views/layouts/admin-layout.blade.php @@ -37,4 +37,4 @@ @stack('end-scripts') - \ No newline at end of file + From 7a36f7d1f56af8573ae378c4517420af9146e3f8 Mon Sep 17 00:00:00 2001 From: fl Date: Fri, 21 Jan 2022 08:59:31 +0700 Subject: [PATCH 2/3] add php lint fixer --- .github/workflows/linter.yml | 31 - .php-cs-fixer.cache | 1 + .php-cs-fixer.php | 14 + app/Http/Controllers/Controller.php | 4 +- app/Http/Controllers/admin/AuthController.php | 5 +- app/Http/Middleware/Authenticate.php | 4 +- .../Middleware/RedirectIfAuthenticated.php | 2 +- app/Models/Admin.php | 7 +- app/Models/Permission.php | 3 +- app/Models/Role.php | 3 +- app/Models/User.php | 5 +- .../atoms/sidebar/MenuDropdownItem.php | 6 +- .../Components/atoms/sidebar/MenuItem.php | 5 +- .../Components/molecules/sidebar/MenuList.php | 4 +- composer.json | 2 + composer.lock | 674 +++++++++++++++++- database/seeders/AdminTableSeeder.php | 1 - routes/web.php | 82 +-- 18 files changed, 766 insertions(+), 87 deletions(-) delete mode 100644 .github/workflows/linter.yml create mode 100644 .php-cs-fixer.cache create mode 100644 .php-cs-fixer.php diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml deleted file mode 100644 index ac11ac3..0000000 --- a/.github/workflows/linter.yml +++ /dev/null @@ -1,31 +0,0 @@ -# This workflow executes several linters on changed files based on languages used in your code base whenever -# you push a code or open a pull request. -# -# You can adjust the behavior by modifying this file. -# For more information, see: -# https://github.com/github/super-linter -name: Lint Code Base - -on: - push: - branches: [master, dev] - pull_request: - branches: [master, dev] -jobs: - run-lint: - runs-on: ubuntu-latest - steps: - - name: run composer install - run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist - - name: Checkout code - uses: actions/checkout@v2 - with: - # Full git history is needed to get a proper list of changed files within `super-linter` - fetch-depth: 0 - - - name: Lint Code Base - uses: github/super-linter@v4 - env: - VALIDATE_ALL_CODEBASE: false - DEFAULT_BRANCH: master - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache new file mode 100644 index 0000000..8db2f3e --- /dev/null +++ b/.php-cs-fixer.cache @@ -0,0 +1 @@ +{"php":"8.1.1","version":"3.5.0:v3.5.0#333f15e07c866e33e2765e84ba1e0b88e6a3af3b","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"}},"hashes":{"app\\Console\\Kernel.php":1530351997,"app\\Exceptions\\Handler.php":1628532150,"app\\Http\\Controllers\\admin\\AdminController.php":4171976001,"app\\Http\\Controllers\\admin\\AuthController.php":1288771624,"app\\Http\\Controllers\\admin\\DashboardController.php":2007707226,"app\\Http\\Controllers\\admin\\PermissionController.php":3247228125,"app\\Http\\Controllers\\admin\\PermissionGroupController.php":1854913236,"app\\Http\\Controllers\\admin\\RoleController.php":345417628,"app\\Http\\Controllers\\Controller.php":879151980,"app\\Http\\Kernel.php":3789506574,"app\\Http\\Middleware\\Authenticate.php":792452674,"app\\Http\\Middleware\\EncryptCookies.php":2317483050,"app\\Http\\Middleware\\PreventRequestsDuringMaintenance.php":1818695846,"app\\Http\\Middleware\\RedirectIfAuthenticated.php":2039326464,"app\\Http\\Middleware\\TrimStrings.php":2824184895,"app\\Http\\Middleware\\TrustHosts.php":4181407162,"app\\Http\\Middleware\\TrustProxies.php":2149945892,"app\\Http\\Middleware\\VerifyCsrfToken.php":515967531,"app\\Models\\Admin.php":1636727082,"app\\Models\\Permission.php":280362115,"app\\Models\\Role.php":2065210620,"app\\Models\\User.php":3612173994,"app\\Providers\\AppServiceProvider.php":1624137708,"app\\Providers\\AuthServiceProvider.php":4151627587,"app\\Providers\\BroadcastServiceProvider.php":3839728412,"app\\Providers\\EventServiceProvider.php":3512437714,"app\\Providers\\RouteServiceProvider.php":2604133516,"app\\View\\Components\\atoms\\sidebar\\MenuDropdownItem.php":2482140229,"app\\View\\Components\\atoms\\sidebar\\MenuItem.php":152970254,"app\\View\\Components\\molecules\\sidebar\\MenuList.php":3531037012,"app\\View\\Components\\organisms\\Sidebar.php":608560997,"bootstrap\\app.php":1695150322,"bootstrap\\cache\\packages.php":1579850742,"bootstrap\\cache\\services.php":1882999530,"config\\app.php":915770649,"config\\auth.php":2811889901,"config\\broadcasting.php":1799697302,"config\\cache.php":2496123169,"config\\cors.php":1385331993,"config\\database.php":1792943348,"config\\filesystems.php":817734639,"config\\form-components.php":296120705,"config\\hashing.php":1409853592,"config\\logging.php":4023024144,"config\\mail.php":3048141809,"config\\permission.php":660198107,"config\\queue.php":2685493111,"config\\sanctum.php":590181964,"config\\services.php":4251272034,"config\\session.php":3682616216,"config\\view.php":2532436371,"database\\factories\\UserFactory.php":2814157441,"database\\migrations\\2014_10_12_000000_create_users_table.php":3331038532,"database\\migrations\\2014_10_12_100000_create_password_resets_table.php":2423716589,"database\\migrations\\2019_08_19_000000_create_failed_jobs_table.php":1394740131,"database\\migrations\\2019_12_14_000001_create_personal_access_tokens_table.php":3100097961,"database\\migrations\\2021_12_05_021006_create_admins_table.php":642273061,"database\\migrations\\2021_12_07_043505_create_permission_tables.php":71512832,"database\\migrations\\2021_12_24_040725_create_permission_group_table.php":2899659586,"database\\seeders\\AdminTableSeeder.php":4155588836,"database\\seeders\\DatabaseSeeder.php":2699395961,"database\\seeders\\PermissionGroupTableSeeder.php":2513512349,"database\\seeders\\PermissionTableSeeder.php":1044219212,"resources\\lang\\en\\auth.php":879913009,"resources\\lang\\en\\pagination.php":2109704695,"resources\\lang\\en\\passwords.php":3172527856,"resources\\lang\\en\\validation.php":2776972484,"resources\\views\\admin\\admin\\admin-create.blade.php":2125885841,"resources\\views\\admin\\admin\\admin-edit.blade.php":3152091780,"resources\\views\\admin\\admin\\admin-list.blade.php":829442165,"resources\\views\\admin\\auth\\login.blade.php":270662175,"resources\\views\\admin\\dashboard.blade.php":3154657344,"resources\\views\\admin\\permission\\permission-create.blade.php":1839375365,"resources\\views\\admin\\permission\\permission-edit.blade.php":2554498882,"resources\\views\\admin\\permission\\permission-list.blade.php":1701281509,"resources\\views\\admin\\permission-group\\permission-group-create.blade.php":2180226659,"resources\\views\\admin\\permission-group\\permission-group-edit.blade.php":132673911,"resources\\views\\admin\\permission-group\\permission-group-list.blade.php":1227261724,"resources\\views\\admin\\role\\role-create.blade.php":2736520696,"resources\\views\\admin\\role\\role-edit.blade.php":1642521785,"resources\\views\\admin\\role\\role-list.blade.php":163111211,"resources\\views\\components\\atoms\\sidebar\\menu-dropdown-item.blade.php":865719015,"resources\\views\\components\\atoms\\sidebar\\menu-item.blade.php":2678812776,"resources\\views\\components\\molecules\\sidebar\\menu-list.blade.php":1186428068,"resources\\views\\components\\organisms\\sidebar.blade.php":1547593853,"resources\\views\\layouts\\admin\\footer.blade.php":1781736990,"resources\\views\\layouts\\admin\\navbar.blade.php":1765095970,"resources\\views\\layouts\\admin\\sidebar.blade.php":1011700518,"resources\\views\\layouts\\admin\\ui-settings.blade.php":733471941,"resources\\views\\layouts\\admin-layout.blade.php":3688227687,"resources\\views\\welcome.blade.php":3506923178,"routes\\api.php":4124586055,"routes\\channels.php":3012012949,"routes\\console.php":130084247,"routes\\web.php":187313221,"server.php":2108507027,"storage\\framework\\views\\03556aa257a06b303ccf6a72dda3c6e612f6f8f5.php":3986149702,"storage\\framework\\views\\0f9836c74e9bee07b18e9d14058f7f67ba93e6e9.php":3687189980,"storage\\framework\\views\\10ca1418a30902fb26ef5affa8c178aa6f4824f7.php":1012293684,"storage\\framework\\views\\1a48107b1bada9651a2aa2a2bf9bb10c194014af.php":2442276884,"storage\\framework\\views\\2de95b577dbb2b2659fb21e1ae89aff57da64271.php":2847373078,"storage\\framework\\views\\34e22d96a7f1f561d46b677576f689aa1c2646d8.php":2060539342,"storage\\framework\\views\\4275bbe52bb2ba6f8c3cb2db7532144663db053f.php":2894724457,"storage\\framework\\views\\44b526e7d033252dc1059bbde368a5d7904912d0.php":3763074139,"storage\\framework\\views\\51a44296bd70b3be8ceee91bc4cdc7a4b489f2e9.php":1074370582,"storage\\framework\\views\\58d1264779af175d0894c82858034db2720f993e.php":1908897691,"storage\\framework\\views\\6098cc3649bd2ff7bddb9059feca98598e3a150f.php":773792224,"storage\\framework\\views\\6497e91b35a6a6adfe2e13397cfe4409979b0345.php":2594618495,"storage\\framework\\views\\6a95fd0f89f753f74258d5727a069fe952c380d2.php":4097372140,"storage\\framework\\views\\6f5df5d5a9c56ab62d3edf644d46e723abf012ee.php":3043892557,"storage\\framework\\views\\7e332df192570462cb726baaafdb4cf2b4a52a85.php":275785072,"storage\\framework\\views\\7e90931803630740683ddf142142aae0ca64cabd.php":688381659,"storage\\framework\\views\\7f4532ca654f6a7db2ec20f3b899837f454f10ad.php":3373560886,"storage\\framework\\views\\823457f10ca2a0a46e7bcbcc7e694dd6d29f114b.php":1242390261,"storage\\framework\\views\\a6a92f8061702fa5f2f2f06b96d889f6a0bd2a7e.php":2226541709,"storage\\framework\\views\\b1fed701b1f6f81917961dbc94f0d2d83ea9fbe5.php":1009403513,"storage\\framework\\views\\bf23d87e41127686d839716a7f76d8bec2838d55.php":3185517484,"storage\\framework\\views\\c3755d18993d77c94acc464d362e76a9456619aa.php":414525362,"storage\\framework\\views\\c4e98674d0a13bf4d59f618e33ce995c2a4a74bf.php":4004336423,"storage\\framework\\views\\c864615a292477a74ce553843c120f073d8dda20.php":4229992881,"storage\\framework\\views\\e48399b2572649a2c1586971459971c400f0e6a0.php":168429683,"tests\\CreatesApplication.php":1811814938,"tests\\Feature\\ExampleTest.php":3092716863,"tests\\TestCase.php":1353191102,"tests\\Unit\\ExampleTest.php":2180507211}} \ No newline at end of file diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 0000000..0e31bf9 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,14 @@ +exclude(['.github', '.vscode', '.node_modules', 'public', 'vendor']) + ->in(__DIR__) +; + +$config = new PhpCsFixer\Config(); +return $config->setRules([ + '@PSR12' => true, + 'array_syntax' => ['syntax' => 'short'], + ]) + ->setFinder($finder) +; \ No newline at end of file diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index a0a2a8a..ce1176d 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -9,5 +9,7 @@ class Controller extends BaseController { - use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + use AuthorizesRequests; + use DispatchesJobs; + use ValidatesRequests; } diff --git a/app/Http/Controllers/admin/AuthController.php b/app/Http/Controllers/admin/AuthController.php index 90823e9..331c318 100755 --- a/app/Http/Controllers/admin/AuthController.php +++ b/app/Http/Controllers/admin/AuthController.php @@ -20,7 +20,7 @@ public function login(Request $request) "password" => "required", ]); - if(Auth::guard('admin')->attempt($validatedForm)) { + if (Auth::guard('admin')->attempt($validatedForm)) { $request->session()->regenerate(); return redirect()->intended(route('admin.dashboard')); @@ -31,7 +31,8 @@ public function login(Request $request) ]); } - public function logout(Request $request){ + public function logout(Request $request) + { Auth::guard('admin')->logout(); $request->session()->invalidate(); $request->session()->regenerateToken(); diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 26ad803..f6e3893 100755 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -15,7 +15,9 @@ class Authenticate extends Middleware protected function redirectTo($request) { if (! $request->expectsJson()) { - if($request->is('admin/*')) return route('admin.login'); + if ($request->is('admin/*')) { + return route('admin.login'); + } } } } diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 15c4c4f..f0e1864 100755 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -23,7 +23,7 @@ public function handle(Request $request, Closure $next, ...$guards) foreach ($guards as $guard) { if (Auth::guard($guard)->check()) { - switch($guard){ + switch ($guard) { case 'admin': return redirect(RouteServiceProvider::ADMIN_HOME); } diff --git a/app/Models/Admin.php b/app/Models/Admin.php index b7c2edf..0e6dccf 100755 --- a/app/Models/Admin.php +++ b/app/Models/Admin.php @@ -10,13 +10,16 @@ class Admin extends Authenticatable { - use Notifiable, HasFactory, HasRoles; + use Notifiable; + use HasFactory; + use HasRoles; protected $fillable = ['name', 'username', 'password', 'status']; protected $hidden = ['password']; - public function getMainRole(){ + public function getMainRole() + { return $this->roles->pluck('name')[0]; } } diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 65fa660..3768979 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -11,7 +11,8 @@ class Permission extends SpatiePermission protected $fillable = ['name', 'group', 'guard_name']; - public function scopeAdmin($query){ + public function scopeAdmin($query) + { $query->where('guard_name', 'admin'); } } diff --git a/app/Models/Role.php b/app/Models/Role.php index 1437864..deaa1cd 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -9,7 +9,8 @@ class Role extends SpatieRole { use HasFactory; - public function scopeAdmin($query){ + public function scopeAdmin($query) + { $query->where('guard_name', 'admin'); } } diff --git a/app/Models/User.php b/app/Models/User.php index d0f472f..835a341 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -11,7 +11,10 @@ class User extends Authenticatable { - use HasApiTokens, HasFactory, Notifiable, HasRoles; + use HasApiTokens; + use HasFactory; + use Notifiable; + use HasRoles; /** * The attributes that are mass assignable. diff --git a/app/View/Components/atoms/sidebar/MenuDropdownItem.php b/app/View/Components/atoms/sidebar/MenuDropdownItem.php index a7613d6..68f563b 100755 --- a/app/View/Components/atoms/sidebar/MenuDropdownItem.php +++ b/app/View/Components/atoms/sidebar/MenuDropdownItem.php @@ -6,7 +6,11 @@ class MenuDropdownItem extends Component { - public $name, $children, $icon, $isActive, $permission; + public $name; + public $children; + public $icon; + public $isActive; + public $permission; /** * Create a new component instance. diff --git a/app/View/Components/atoms/sidebar/MenuItem.php b/app/View/Components/atoms/sidebar/MenuItem.php index aee8dc0..18f0211 100755 --- a/app/View/Components/atoms/sidebar/MenuItem.php +++ b/app/View/Components/atoms/sidebar/MenuItem.php @@ -6,7 +6,10 @@ class MenuItem extends Component { - public $name, $href, $icon, $permission; + public $name; + public $href; + public $icon; + public $permission; /** * Create a new component instance. diff --git a/app/View/Components/molecules/sidebar/MenuList.php b/app/View/Components/molecules/sidebar/MenuList.php index 60bbc95..f9e1440 100755 --- a/app/View/Components/molecules/sidebar/MenuList.php +++ b/app/View/Components/molecules/sidebar/MenuList.php @@ -6,7 +6,9 @@ class MenuList extends Component { - public $name, $menuItem, $permission; + public $name; + public $menuItem; + public $permission; public function __construct($name, $menuItem, $permission = []) { diff --git a/composer.json b/composer.json index b3de583..4375560 100755 --- a/composer.json +++ b/composer.json @@ -6,6 +6,7 @@ "license": "MIT", "require": { "php": "^7.3|^8.0", + "friendsofphp/php-cs-fixer": "^3.5", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "laravel/framework": "^8.65", @@ -38,6 +39,7 @@ } }, "scripts": { + "fix-lint": "vendor/bin/php-cs-fixer fix", "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi" diff --git a/composer.lock b/composer.lock index 202d4cc..f3225af 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2094e2f43f8b11ad15f0f6e3ce39a3c7", + "content-hash": "966e59518bc1604d67e4f7985fd4172a", "packages": [ { "name": "asm89/stack-cors", @@ -122,6 +122,224 @@ ], "time": "2021-08-15T20:50:18+00:00" }, + { + "name": "composer/pcre", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" + }, + { + "name": "composer/semver", + "version": "3.2.7", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.54", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.2.7" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-04T09:57:54+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8", + "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8", + "shasum": "" + }, + "require": { + "composer/pcre": "^1", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-04T18:29:42+00:00" + }, { "name": "dflydev/dot-access-data", "version": "v3.0.1", @@ -197,6 +415,78 @@ }, "time": "2021-08-13T13:06:58+00:00" }, + { + "name": "doctrine/annotations", + "version": "1.13.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" + }, + "require-dev": { + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/coding-standard": "^6.0 || ^8.1", + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.2" + }, + "time": "2021-08-05T19:00:23+00:00" + }, { "name": "doctrine/inflector", "version": "2.0.4", @@ -493,6 +783,95 @@ ], "time": "2020-12-29T14:50:06+00:00" }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/333f15e07c866e33e2765e84ba1e0b88e6a3af3b", + "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b", + "shasum": "" + }, + "require": { + "composer/semver": "^3.2", + "composer/xdebug-handler": "^3.0", + "doctrine/annotations": "^1.13", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0", + "php-cs-fixer/diff": "^2.0", + "symfony/console": "^5.4 || ^6.0", + "symfony/event-dispatcher": "^5.4 || ^6.0", + "symfony/filesystem": "^5.4 || ^6.0", + "symfony/finder": "^5.4 || ^6.0", + "symfony/options-resolver": "^5.4 || ^6.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.23", + "symfony/polyfill-php81": "^1.23", + "symfony/process": "^5.4 || ^6.0", + "symfony/stopwatch": "^5.4 || ^6.0" + }, + "require-dev": { + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^1.5", + "mikey179/vfsstream": "^1.6.10", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy": "^1.15", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "phpunitgoodpractices/polyfill": "^1.5", + "phpunitgoodpractices/traits": "^1.9.1", + "symfony/phpunit-bridge": "^6.0", + "symfony/yaml": "^5.4 || ^6.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "support": { + "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2022-01-14T00:29:20+00:00" + }, { "name": "fruitcake/laravel-cors", "version": "v2.0.5", @@ -2289,6 +2668,58 @@ }, "time": "2021-04-09T13:42:10+00:00" }, + { + "name": "php-cs-fixer/diff", + "version": "v2.0.2", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "sebastian/diff v3 backport support for PHP 5.6+", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/diff/issues", + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" + }, + "time": "2020-10-14T08:32:19+00:00" + }, { "name": "phpoption/phpoption", "version": "1.8.1", @@ -2442,6 +2873,55 @@ ], "time": "2022-01-05T11:04:01+00:00" }, + { + "name": "psr/cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/3.0.0" + }, + "time": "2021-02-03T23:26:27+00:00" + }, { "name": "psr/container", "version": "1.1.2", @@ -3719,6 +4199,69 @@ ], "time": "2021-07-15T12:33:35+00:00" }, + { + "name": "symfony/filesystem", + "version": "v6.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "52b3c9cce673b014915445a432339f282e002ce6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/52b3c9cce673b014915445a432339f282e002ce6", + "reference": "52b3c9cce673b014915445a432339f282e002ce6", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.0.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-10-29T07:35:21+00:00" + }, { "name": "symfony/finder", "version": "v5.4.2", @@ -4050,6 +4593,73 @@ ], "time": "2021-12-28T17:15:56+00:00" }, + { + "name": "symfony/options-resolver", + "version": "v6.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "be0facf48a42a232d6c0daadd76e4eb5657a4798" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/be0facf48a42a232d6c0daadd76e4eb5657a4798", + "reference": "be0facf48a42a232d6c0daadd76e4eb5657a4798", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.0.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-23T19:05:29+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.24.0", @@ -5101,6 +5711,68 @@ ], "time": "2021-11-04T16:37:19+00:00" }, + { + "name": "symfony/stopwatch", + "version": "v6.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "0e0ed55d1ffdfadd03af180443fbdca9876483b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0e0ed55d1ffdfadd03af180443fbdca9876483b3", + "reference": "0e0ed55d1ffdfadd03af180443fbdca9876483b3", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/service-contracts": "^1|^2|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.0.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-23T19:05:29+00:00" + }, { "name": "symfony/string", "version": "v6.0.2", diff --git a/database/seeders/AdminTableSeeder.php b/database/seeders/AdminTableSeeder.php index 59c3402..178a03d 100755 --- a/database/seeders/AdminTableSeeder.php +++ b/database/seeders/AdminTableSeeder.php @@ -27,6 +27,5 @@ public function run() 'password' => bcrypt("testing123"), 'status' => 1, ]); - } } diff --git a/routes/web.php b/routes/web.php index a4eea89..469ecf7 100755 --- a/routes/web.php +++ b/routes/web.php @@ -14,52 +14,52 @@ */ Route::redirect('/', '/admin'); -Route::group(['prefix' => 'admin', 'as' => 'admin.'], function(){ - Route::redirect('/', '/admin/dashboard'); +Route::group(['prefix' => 'admin', 'as' => 'admin.'], function () { + Route::redirect('/', '/admin/dashboard'); - Route::middleware(['guest:admin'])->group(function () { - Route::get('/login', 'admin\AuthController@loginForm')->name('login'); - Route::post('/login', 'admin\AuthController@login')->name('login.post'); - }); + Route::middleware(['guest:admin'])->group(function () { + Route::get('/login', 'admin\AuthController@loginForm')->name('login'); + Route::post('/login', 'admin\AuthController@login')->name('login.post'); + }); - Route::group(['middleware' => 'auth:admin'], function(){ - Route::post('/logout', 'admin\AuthController@logout')->name('logout'); - Route::get('/dashboard', 'admin\DashboardController@index')->name('dashboard'); + Route::group(['middleware' => 'auth:admin'], function () { + Route::post('/logout', 'admin\AuthController@logout')->name('logout'); + Route::get('/dashboard', 'admin\DashboardController@index')->name('dashboard'); - Route::group(['prefix' => 'admin', 'as' => 'admin.'], function(){ - Route::get('/', 'admin\AdminController@index')->name('list'); - Route::get('/create', 'admin\AdminController@create')->name('create'); - Route::post('/create', 'admin\AdminController@createPost')->name('create.post'); - Route::get('/edit/{admin}', 'admin\AdminController@edit')->name('edit'); - Route::patch('/edit/{admin}', 'admin\AdminController@editPatch')->name('edit.patch'); - Route::delete('/delete/{admin}', 'admin\AdminController@destroy')->name('delete'); - }); + Route::group(['prefix' => 'admin', 'as' => 'admin.'], function () { + Route::get('/', 'admin\AdminController@index')->name('list'); + Route::get('/create', 'admin\AdminController@create')->name('create'); + Route::post('/create', 'admin\AdminController@createPost')->name('create.post'); + Route::get('/edit/{admin}', 'admin\AdminController@edit')->name('edit'); + Route::patch('/edit/{admin}', 'admin\AdminController@editPatch')->name('edit.patch'); + Route::delete('/delete/{admin}', 'admin\AdminController@destroy')->name('delete'); + }); - Route::group(['prefix' => 'role', 'as' => 'role.'], function(){ - Route::get('/', 'admin\RoleController@index')->name('list'); - Route::get('/create', 'admin\RoleController@create')->name('create'); - Route::post('/create', 'admin\RoleController@createPost')->name('create.post'); - Route::get('/edit/{role}', 'admin\RoleController@edit')->name('edit'); - Route::patch('/edit/{role}', 'admin\RoleController@editPatch')->name('edit.patch'); - Route::delete('/delete/{role}', 'admin\RoleController@destroy')->name('delete'); - }); + Route::group(['prefix' => 'role', 'as' => 'role.'], function () { + Route::get('/', 'admin\RoleController@index')->name('list'); + Route::get('/create', 'admin\RoleController@create')->name('create'); + Route::post('/create', 'admin\RoleController@createPost')->name('create.post'); + Route::get('/edit/{role}', 'admin\RoleController@edit')->name('edit'); + Route::patch('/edit/{role}', 'admin\RoleController@editPatch')->name('edit.patch'); + Route::delete('/delete/{role}', 'admin\RoleController@destroy')->name('delete'); + }); - Route::group(['prefix' => 'permission', 'as' => 'permission.'], function(){ - Route::get('/', 'admin\PermissionController@index')->name('list'); - Route::get('/create', 'admin\PermissionController@create')->name('create'); - Route::post('/create', 'admin\PermissionController@createPost')->name('create.post'); - Route::get('/edit/{permission}', 'admin\PermissionController@edit')->name('edit'); - Route::patch('/edit/{permission}', 'admin\PermissionController@editPatch')->name('edit.patch'); - Route::delete('/delete/{permission}', 'admin\PermissionController@destroy')->name('delete'); - }); + Route::group(['prefix' => 'permission', 'as' => 'permission.'], function () { + Route::get('/', 'admin\PermissionController@index')->name('list'); + Route::get('/create', 'admin\PermissionController@create')->name('create'); + Route::post('/create', 'admin\PermissionController@createPost')->name('create.post'); + Route::get('/edit/{permission}', 'admin\PermissionController@edit')->name('edit'); + Route::patch('/edit/{permission}', 'admin\PermissionController@editPatch')->name('edit.patch'); + Route::delete('/delete/{permission}', 'admin\PermissionController@destroy')->name('delete'); + }); - Route::group(['prefix' => 'permission-group', 'as' => 'permission-group.'], function(){ - Route::get('/', 'admin\PermissionGroupController@index')->name('list'); - Route::get('/create', 'admin\PermissionGroupController@create')->name('create'); - Route::post('/create', 'admin\PermissionGroupController@createPost')->name('create.post'); - Route::get('/edit/{id}', 'admin\PermissionGroupController@edit')->name('edit'); - Route::patch('/edit/{id}', 'admin\PermissionGroupController@editPatch')->name('edit.patch'); - Route::delete('/delete/{id}', 'admin\PermissionGroupController@destroy')->name('delete'); + Route::group(['prefix' => 'permission-group', 'as' => 'permission-group.'], function () { + Route::get('/', 'admin\PermissionGroupController@index')->name('list'); + Route::get('/create', 'admin\PermissionGroupController@create')->name('create'); + Route::post('/create', 'admin\PermissionGroupController@createPost')->name('create.post'); + Route::get('/edit/{id}', 'admin\PermissionGroupController@edit')->name('edit'); + Route::patch('/edit/{id}', 'admin\PermissionGroupController@editPatch')->name('edit.patch'); + Route::delete('/delete/{id}', 'admin\PermissionGroupController@destroy')->name('delete'); + }); }); - }); }); From 910a92c0af08c389c5ddcd481ba76f302e337cb9 Mon Sep 17 00:00:00 2001 From: fl Date: Fri, 21 Jan 2022 09:55:11 +0700 Subject: [PATCH 3/3] update --- .gitignore | 1 + .php-cs-fixer.php | 2 +- .../Controllers/admin/AdminController.php | 4 +- .../Controllers/admin/DashboardController.php | 1 - .../admin/PermissionController.php | 2 +- .../admin/PermissionGroupController.php | 2 +- app/Http/Controllers/admin/RoleController.php | 4 +- app/Models/Admin.php | 1 - app/Models/User.php | 1 - app/Providers/AuthServiceProvider.php | 1 - app/Providers/EventServiceProvider.php | 1 - composer.json | 3 +- composer.lock | 56 ++++++++++++++++++- .../2014_10_12_000000_create_users_table.php | 10 ---- ...12_100000_create_password_resets_table.php | 10 ---- ..._08_19_000000_create_failed_jobs_table.php | 10 ---- ...01_create_personal_access_tokens_table.php | 10 ---- .../2021_12_05_021006_create_admins_table.php | 10 ---- ..._12_07_043505_create_permission_tables.php | 14 +---- ...4_040725_create_permission_group_table.php | 10 ---- database/seeders/AdminTableSeeder.php | 2 +- .../seeders/PermissionGroupTableSeeder.php | 2 +- database/seeders/PermissionTableSeeder.php | 2 +- .../views/admin/admin/admin-create.blade.php | 2 +- .../views/admin/admin/admin-edit.blade.php | 2 +- .../views/admin/admin/admin-list.blade.php | 2 +- resources/views/admin/auth/login.blade.php | 2 +- resources/views/admin/dashboard.blade.php | 2 +- .../permission-group-create.blade.php | 2 +- .../permission-group-edit.blade.php | 2 +- .../permission-group-list.blade.php | 2 +- .../permission/permission-create.blade.php | 2 +- .../permission/permission-edit.blade.php | 2 +- .../permission/permission-list.blade.php | 2 +- .../views/admin/role/role-create.blade.php | 2 +- .../views/admin/role/role-edit.blade.php | 2 +- .../views/admin/role/role-list.blade.php | 2 +- .../components/organisms/sidebar.blade.php | 2 +- .../views/layouts/admin/footer.blade.php | 2 +- .../views/layouts/admin/navbar.blade.php | 2 +- .../views/layouts/admin/sidebar.blade.php | 2 +- .../views/layouts/admin/ui-settings.blade.php | 2 +- tests/CreatesApplication.php | 2 +- tests/Feature/ExampleTest.php | 1 - 44 files changed, 90 insertions(+), 110 deletions(-) diff --git a/.gitignore b/.gitignore index eb003b0..b94146e 100755 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ npm-debug.log yarn-error.log /.idea /.vscode +.php-cs-fixer.cache \ No newline at end of file diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 0e31bf9..51d4636 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -11,4 +11,4 @@ 'array_syntax' => ['syntax' => 'short'], ]) ->setFinder($finder) -; \ No newline at end of file +; diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index 638d2e8..88478d6 100755 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -3,11 +3,11 @@ namespace App\Http\Controllers\admin; use App\Http\Controllers\Controller; -use Illuminate\Http\Request; use App\Models\Admin; -use Spatie\Permission\Models\Role; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; +use Spatie\Permission\Models\Role; class AdminController extends Controller { diff --git a/app/Http/Controllers/admin/DashboardController.php b/app/Http/Controllers/admin/DashboardController.php index 265664d..5c7142f 100755 --- a/app/Http/Controllers/admin/DashboardController.php +++ b/app/Http/Controllers/admin/DashboardController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\admin; use App\Http\Controllers\Controller; -use Illuminate\Http\Request; class DashboardController extends Controller { diff --git a/app/Http/Controllers/admin/PermissionController.php b/app/Http/Controllers/admin/PermissionController.php index b67f128..bcdb674 100644 --- a/app/Http/Controllers/admin/PermissionController.php +++ b/app/Http/Controllers/admin/PermissionController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\admin; use App\Http\Controllers\Controller; -use Illuminate\Http\Request; use App\Models\Permission; use DB; +use Illuminate\Http\Request; class PermissionController extends Controller { diff --git a/app/Http/Controllers/admin/PermissionGroupController.php b/app/Http/Controllers/admin/PermissionGroupController.php index 52149b5..f22c9b8 100644 --- a/app/Http/Controllers/admin/PermissionGroupController.php +++ b/app/Http/Controllers/admin/PermissionGroupController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\admin; use App\Http\Controllers\Controller; -use Illuminate\Http\Request; use DB; +use Illuminate\Http\Request; class PermissionGroupController extends Controller { diff --git a/app/Http/Controllers/admin/RoleController.php b/app/Http/Controllers/admin/RoleController.php index c5afdb6..1ac3946 100644 --- a/app/Http/Controllers/admin/RoleController.php +++ b/app/Http/Controllers/admin/RoleController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\admin; use App\Http\Controllers\Controller; -use Illuminate\Http\Request; -use App\Models\Role; use App\Models\Permission; +use App\Models\Role; +use Illuminate\Http\Request; class RoleController extends Controller { diff --git a/app/Models/Admin.php b/app/Models/Admin.php index 0e6dccf..94a4404 100755 --- a/app/Models/Admin.php +++ b/app/Models/Admin.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; -use Spatie\Permission\Models\Role; use Spatie\Permission\Traits\HasRoles; class Admin extends Authenticatable diff --git a/app/Models/User.php b/app/Models/User.php index 835a341..4f862a2 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,7 +2,6 @@ namespace App\Models; -use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index ce74491..d49c386 100755 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a9f10a6..46acbe0 100755 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -5,7 +5,6 @@ use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { diff --git a/composer.json b/composer.json index 4375560..d5798d4 100755 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "laravel/tinker": "^2.5", "laravolt/avatar": "^4.1", "protonemedia/laravel-form-components": "^3.2", - "spatie/laravel-permission": "^5.4" + "spatie/laravel-permission": "^5.4", + "tightenco/tlint": "^6.2" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.6", diff --git a/composer.lock b/composer.lock index f3225af..9fcbbd0 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "966e59518bc1604d67e4f7985fd4172a", + "content-hash": "d678a6f31d93f2ddcf16f5baaa991f29", "packages": [ { "name": "asm89/stack-cors", @@ -6120,6 +6120,60 @@ ], "time": "2021-12-29T10:10:35+00:00" }, + { + "name": "tightenco/tlint", + "version": "v6.2.1", + "source": { + "type": "git", + "url": "https://github.com/tighten/tlint.git", + "reference": "c9d53ef9e20d5dccb027dba3edd07745675916a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tighten/tlint/zipball/c9d53ef9e20d5dccb027dba3edd07745675916a0", + "reference": "c9d53ef9e20d5dccb027dba3edd07745675916a0", + "shasum": "" + }, + "require": { + "illuminate/view": "*", + "nikic/php-parser": "^4.12", + "php": ">=7.3", + "symfony/console": "^4.4.30 || ^5.3.7 || ^6.0", + "symfony/process": "^4.3 || ^5.0 || ^6.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.1", + "phpunit/phpunit": "^9.3", + "symfony/var-dumper": "^5.3" + }, + "bin": [ + "bin/tlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Tighten\\TLint\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Logan Henson", + "email": "logan@loganhenson.com", + "role": "Developer" + } + ], + "description": "Tighten linter for Laravel conventions", + "homepage": "https://github.com/tighten/tlint", + "support": { + "issues": "https://github.com/tighten/tlint/issues", + "source": "https://github.com/tighten/tlint/tree/v6.2.1" + }, + "time": "2021-11-12T16:22:12+00:00" + }, { "name": "tijsverkoyen/css-to-inline-styles", "version": "2.2.4", diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 621a24e..f9e8e31 100755 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -6,11 +6,6 @@ class CreateUsersTable extends Migration { - /** - * Run the migrations. - * - * @return void - */ public function up() { Schema::create('users', function (Blueprint $table) { @@ -24,11 +19,6 @@ public function up() }); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { Schema::dropIfExists('users'); diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php index 0ee0a36..1ee8089 100755 --- a/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -6,11 +6,6 @@ class CreatePasswordResetsTable extends Migration { - /** - * Run the migrations. - * - * @return void - */ public function up() { Schema::create('password_resets', function (Blueprint $table) { @@ -20,11 +15,6 @@ public function up() }); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { Schema::dropIfExists('password_resets'); diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php index 6aa6d74..dd08fb8 100755 --- a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php +++ b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php @@ -6,11 +6,6 @@ class CreateFailedJobsTable extends Migration { - /** - * Run the migrations. - * - * @return void - */ public function up() { Schema::create('failed_jobs', function (Blueprint $table) { @@ -24,11 +19,6 @@ public function up() }); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { Schema::dropIfExists('failed_jobs'); diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php index 4315e16..6cf2f0c 100755 --- a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php +++ b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php @@ -6,11 +6,6 @@ class CreatePersonalAccessTokensTable extends Migration { - /** - * Run the migrations. - * - * @return void - */ public function up() { Schema::create('personal_access_tokens', function (Blueprint $table) { @@ -24,11 +19,6 @@ public function up() }); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { Schema::dropIfExists('personal_access_tokens'); diff --git a/database/migrations/2021_12_05_021006_create_admins_table.php b/database/migrations/2021_12_05_021006_create_admins_table.php index 663a175..6c8830e 100755 --- a/database/migrations/2021_12_05_021006_create_admins_table.php +++ b/database/migrations/2021_12_05_021006_create_admins_table.php @@ -6,11 +6,6 @@ class CreateAdminsTable extends Migration { - /** - * Run the migrations. - * - * @return void - */ public function up() { Schema::create('admins', function (Blueprint $table) { @@ -23,11 +18,6 @@ public function up() }); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { Schema::dropIfExists('admins'); diff --git a/database/migrations/2021_12_07_043505_create_permission_tables.php b/database/migrations/2021_12_07_043505_create_permission_tables.php index 16aa2d2..70d67d1 100755 --- a/database/migrations/2021_12_07_043505_create_permission_tables.php +++ b/database/migrations/2021_12_07_043505_create_permission_tables.php @@ -1,17 +1,12 @@ forget(config('permission.cache.key')); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { $tableNames = config('permission.table_names'); diff --git a/database/migrations/2021_12_24_040725_create_permission_group_table.php b/database/migrations/2021_12_24_040725_create_permission_group_table.php index ef258b8..07c07ab 100644 --- a/database/migrations/2021_12_24_040725_create_permission_group_table.php +++ b/database/migrations/2021_12_24_040725_create_permission_group_table.php @@ -6,11 +6,6 @@ class CreatePermissionGroupTable extends Migration { - /** - * Run the migrations. - * - * @return void - */ public function up() { Schema::create('permission_group', function (Blueprint $table) { @@ -20,11 +15,6 @@ public function up() }); } - /** - * Reverse the migrations. - * - * @return void - */ public function down() { Schema::dropIfExists('permission_group'); diff --git a/database/seeders/AdminTableSeeder.php b/database/seeders/AdminTableSeeder.php index 178a03d..6c763ff 100755 --- a/database/seeders/AdminTableSeeder.php +++ b/database/seeders/AdminTableSeeder.php @@ -2,8 +2,8 @@ namespace Database\Seeders; -use Illuminate\Database\Seeder; use App\Models\Admin; +use Illuminate\Database\Seeder; class AdminTableSeeder extends Seeder { diff --git a/database/seeders/PermissionGroupTableSeeder.php b/database/seeders/PermissionGroupTableSeeder.php index c9c332b..b9c38c5 100644 --- a/database/seeders/PermissionGroupTableSeeder.php +++ b/database/seeders/PermissionGroupTableSeeder.php @@ -2,8 +2,8 @@ namespace Database\Seeders; -use Illuminate\Database\Seeder; use DB; +use Illuminate\Database\Seeder; class PermissionGroupTableSeeder extends Seeder { diff --git a/database/seeders/PermissionTableSeeder.php b/database/seeders/PermissionTableSeeder.php index cc8f8d2..ebdb49a 100755 --- a/database/seeders/PermissionTableSeeder.php +++ b/database/seeders/PermissionTableSeeder.php @@ -2,10 +2,10 @@ namespace Database\Seeders; +use DB; use Illuminate\Database\Seeder; use Spatie\Permission\Models\Permission; use Spatie\Permission\Models\Role; -use DB; class PermissionTableSeeder extends Seeder { diff --git a/resources/views/admin/admin/admin-create.blade.php b/resources/views/admin/admin/admin-create.blade.php index 105f69b..59488a6 100755 --- a/resources/views/admin/admin/admin-create.blade.php +++ b/resources/views/admin/admin/admin-create.blade.php @@ -36,4 +36,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/admin/admin-edit.blade.php b/resources/views/admin/admin/admin-edit.blade.php index 3fd8bef..3c1e77d 100755 --- a/resources/views/admin/admin/admin-edit.blade.php +++ b/resources/views/admin/admin/admin-edit.blade.php @@ -69,4 +69,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/admin/admin-list.blade.php b/resources/views/admin/admin/admin-list.blade.php index 9ad7de5..451d93d 100755 --- a/resources/views/admin/admin/admin-list.blade.php +++ b/resources/views/admin/admin/admin-list.blade.php @@ -65,4 +65,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/auth/login.blade.php b/resources/views/admin/auth/login.blade.php index cadec28..1ae80f3 100755 --- a/resources/views/admin/auth/login.blade.php +++ b/resources/views/admin/auth/login.blade.php @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index fc03cd5..42823a5 100755 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -686,4 +686,4 @@ class="ml-1 btn-pill btn-wide border-0 btn-transition btn btn-outline-alternate -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/permission-group/permission-group-create.blade.php b/resources/views/admin/permission-group/permission-group-create.blade.php index efc2add..08402c0 100644 --- a/resources/views/admin/permission-group/permission-group-create.blade.php +++ b/resources/views/admin/permission-group/permission-group-create.blade.php @@ -30,4 +30,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/permission-group/permission-group-edit.blade.php b/resources/views/admin/permission-group/permission-group-edit.blade.php index a9d91c7..befb16e 100644 --- a/resources/views/admin/permission-group/permission-group-edit.blade.php +++ b/resources/views/admin/permission-group/permission-group-edit.blade.php @@ -31,4 +31,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/permission-group/permission-group-list.blade.php b/resources/views/admin/permission-group/permission-group-list.blade.php index 5808430..88ff497 100644 --- a/resources/views/admin/permission-group/permission-group-list.blade.php +++ b/resources/views/admin/permission-group/permission-group-list.blade.php @@ -59,4 +59,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/permission/permission-create.blade.php b/resources/views/admin/permission/permission-create.blade.php index 3c9ea74..26a264c 100644 --- a/resources/views/admin/permission/permission-create.blade.php +++ b/resources/views/admin/permission/permission-create.blade.php @@ -35,4 +35,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/permission/permission-edit.blade.php b/resources/views/admin/permission/permission-edit.blade.php index 66683cb..4481bcd 100644 --- a/resources/views/admin/permission/permission-edit.blade.php +++ b/resources/views/admin/permission/permission-edit.blade.php @@ -38,4 +38,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/permission/permission-list.blade.php b/resources/views/admin/permission/permission-list.blade.php index 6c88207..4d2ed80 100644 --- a/resources/views/admin/permission/permission-list.blade.php +++ b/resources/views/admin/permission/permission-list.blade.php @@ -61,4 +61,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/role/role-create.blade.php b/resources/views/admin/role/role-create.blade.php index 1909df3..2f015ee 100644 --- a/resources/views/admin/role/role-create.blade.php +++ b/resources/views/admin/role/role-create.blade.php @@ -45,4 +45,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/role/role-edit.blade.php b/resources/views/admin/role/role-edit.blade.php index 0c5b4a4..877a85d 100644 --- a/resources/views/admin/role/role-edit.blade.php +++ b/resources/views/admin/role/role-edit.blade.php @@ -46,4 +46,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/role/role-list.blade.php b/resources/views/admin/role/role-list.blade.php index 76f1e6e..2d64b91 100644 --- a/resources/views/admin/role/role-list.blade.php +++ b/resources/views/admin/role/role-list.blade.php @@ -61,4 +61,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/components/organisms/sidebar.blade.php b/resources/views/components/organisms/sidebar.blade.php index d46b315..a406c65 100755 --- a/resources/views/components/organisms/sidebar.blade.php +++ b/resources/views/components/organisms/sidebar.blade.php @@ -84,4 +84,4 @@ @endrole - \ No newline at end of file + diff --git a/resources/views/layouts/admin/footer.blade.php b/resources/views/layouts/admin/footer.blade.php index 84c107d..4babad6 100644 --- a/resources/views/layouts/admin/footer.blade.php +++ b/resources/views/layouts/admin/footer.blade.php @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/resources/views/layouts/admin/navbar.blade.php b/resources/views/layouts/admin/navbar.blade.php index 2b7a8d8..d43882e 100644 --- a/resources/views/layouts/admin/navbar.blade.php +++ b/resources/views/layouts/admin/navbar.blade.php @@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index f1fa149..145f054 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/resources/views/layouts/admin/ui-settings.blade.php b/resources/views/layouts/admin/ui-settings.blade.php index 30d7e14..68da3df 100644 --- a/resources/views/layouts/admin/ui-settings.blade.php +++ b/resources/views/layouts/admin/ui-settings.blade.php @@ -337,4 +337,4 @@ class="btn-wide btn-shadow btn-primary active btn btn-secondary switch-theme-cla - \ No newline at end of file + diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index 547152f..ab92402 100755 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -13,7 +13,7 @@ trait CreatesApplication */ public function createApplication() { - $app = require __DIR__.'/../bootstrap/app.php'; + $app = require __DIR__ . '/../bootstrap/app.php'; $app->make(Kernel::class)->bootstrap(); diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 5a16286..36848ec 100755 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -2,7 +2,6 @@ namespace Tests\Feature; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class ExampleTest extends TestCase