Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .github/workflows/linter.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ npm-debug.log
yarn-error.log
/.idea
/.vscode
.php-cs-fixer.cache
1 change: 1 addition & 0 deletions .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -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}}
14 changes: 14 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$finder = PhpCsFixer\Finder::create()
->exclude(['.github', '.vscode', '.node_modules', 'public', 'vendor'])
->in(__DIR__)
;

$config = new PhpCsFixer\Config();
return $config->setRules([
'@PSR12' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder($finder)
;
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
- [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar)

### Javascript
- [vuejs/petite-vue](https://github.com/vuejs/petite-vue)
- [vuejs/petite-vue](https://github.com/vuejs/petite-vue)
4 changes: 3 additions & 1 deletion app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@

class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
}
4 changes: 2 additions & 2 deletions app/Http/Controllers/admin/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
5 changes: 3 additions & 2 deletions app/Http/Controllers/admin/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand All @@ -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();
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/admin/DashboardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Controllers\admin;

use App\Http\Controllers\Controller;
use Illuminate\Http\Request;

class DashboardController extends Controller
{
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/admin/PermissionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/admin/PermissionGroupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/admin/RoleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Middleware/Authenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
}
}
2 changes: 1 addition & 1 deletion app/Http/Middleware/RedirectIfAuthenticated.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 5 additions & 3 deletions app/Models/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
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
{
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];
}
}
3 changes: 2 additions & 1 deletion app/Models/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
3 changes: 2 additions & 1 deletion app/Models/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ class Role extends SpatieRole
{
use HasFactory;

public function scopeAdmin($query){
public function scopeAdmin($query)
{
$query->where('guard_name', 'admin');
}
}
6 changes: 4 additions & 2 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -11,7 +10,10 @@

class User extends Authenticatable
{
use HasApiTokens, HasFactory, Notifiable, HasRoles;
use HasApiTokens;
use HasFactory;
use Notifiable;
use HasRoles;

/**
* The attributes that are mass assignable.
Expand Down
1 change: 0 additions & 1 deletion app/Providers/AuthServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Providers;

use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Gate;

class AuthServiceProvider extends ServiceProvider
{
Expand Down
1 change: 0 additions & 1 deletion app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 5 additions & 1 deletion app/View/Components/atoms/sidebar/MenuDropdownItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion app/View/Components/atoms/sidebar/MenuItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion app/View/Components/molecules/sidebar/MenuList.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

class MenuList extends Component
{
public $name, $menuItem, $permission;
public $name;
public $menuItem;
public $permission;

public function __construct($name, $menuItem, $permission = [])
{
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
"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",
"laravel/sanctum": "^2.11",
"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",
Expand All @@ -38,6 +40,7 @@
}
},
"scripts": {
"fix-lint": "vendor/bin/php-cs-fixer fix",
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
Expand Down
Loading