diff --git a/README.md b/README.md index 4b4ae88..25ea15a 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,7 @@ - `./vendor/bin/sail up` - `./vendor/bin/sail npm install` - `./vendor/bin/sail npm run dev` -- `./vendor/bin/sail artisan vendor:publish --provider="BalajiDharma\LaravelAdminCore\AdminCoreServiceProvider"` -- `./vendor/bin/sail artisan vendor:publish --provider="BalajiDharma\LaravelMenu\MenuServiceProvider"` +- `./vendor/bin/sail artisan vendor:publish --tag=admin-core` - `./vendor/bin/sail artisan migrate --seed --seeder=AdminCoreSeeder` - Now open http://localhost/ @@ -39,8 +38,7 @@ - `composer create-project balajidharma/laravel-vue-admin-panel admin-app` - `cd admin-app` - Create a new MYSQL database and update database details in `.env` file -- `php artisan vendor:publish --provider="BalajiDharma\LaravelAdminCore\AdminCoreServiceProvider"` -- `php artisan vendor:publish --provider="BalajiDharma\LaravelMenu\MenuServiceProvider"` +- `artisan vendor:publish --tag=admin-core` - `php artisan migrate --seed --seeder=AdminCoreSeeder` - `npm install` - `npm run dev` diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index d8bc1d2..854bcc8 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -10,7 +10,6 @@ class Kernel extends ConsoleKernel /** * Define the application's command schedule. * - * @param \Illuminate\Console\Scheduling\Schedule $schedule * @return void */ protected function schedule(Schedule $schedule) diff --git a/app/Http/Controllers/Admin/CategoryController.php b/app/Http/Controllers/Admin/CategoryController.php index 20c3d28..bdfdadc 100644 --- a/app/Http/Controllers/Admin/CategoryController.php +++ b/app/Http/Controllers/Admin/CategoryController.php @@ -5,8 +5,8 @@ use App\Http\Controllers\Controller; use BalajiDharma\LaravelAdminCore\Requests\StoreCategoryRequest; use BalajiDharma\LaravelAdminCore\Requests\UpdateCategoryRequest; -use BalajiDharma\LaravelCategory\Models\CategoryType; use BalajiDharma\LaravelCategory\Models\Category; +use BalajiDharma\LaravelCategory\Models\CategoryType; use Illuminate\Support\Facades\Auth; use Inertia\Inertia; @@ -36,11 +36,11 @@ public function index(CategoryType $type) 'create' => Auth::user()->can('category create'), 'edit' => Auth::user()->can('category edit'), 'delete' => Auth::user()->can('category delete'), - ] + ], ]); } - /** + /** * Show the form for creating a new resource. * * @return \Inertia\Response @@ -48,72 +48,67 @@ public function index(CategoryType $type) public function create(CategoryType $type) { $itemOptions = Category::selectOptions($type->id, null, true); + return Inertia::render('Admin/Category/Item/Create', [ 'categoryType' => $type, - 'itemOptions' => $itemOptions + 'itemOptions' => $itemOptions, ]); } /** * Store a newly created resource in storage. * - * @param StoreCategoryRequest $request - * @param \BalajiDharma\LaravelCategory\Models\CategoryType $type * @return \Illuminate\Http\RedirectResponse */ public function store(StoreCategoryRequest $request, CategoryType $type) { - if(!$request->has('enabled')) { + if (! $request->has('enabled')) { $request['enabled'] = false; } $type->categories()->create($request->all()); return redirect()->route('category.type.item.index', $type->id) - ->with('message', 'Category created successfully.'); + ->with('message', 'Category created successfully.'); } /** * Show the form for editing the specified resource. * - * @param \BalajiDharma\LaravelCategory\Models\CategoryType $type * @return \Inertia\Response */ public function edit(CategoryType $type, Category $item) { $itemOptions = Category::selectOptions($type->id, $item->parent_id ?? $item->id); + return Inertia::render('Admin/Category/Item/Edit', [ 'categoryType' => $type, 'item' => $item, - 'itemOptions' => $itemOptions + 'itemOptions' => $itemOptions, ]); } /** * Update the specified resource in storage. * - * @param UpdateCategoryRequest $request - * @param \BalajiDharma\LaravelCategory\Models\CategoryType $type - * @param \BalajiDharma\LaravelCategory\Models\Category $item * @return \Illuminate\Http\RedirectResponse */ public function update(UpdateCategoryRequest $request, CategoryType $type, Category $item) { - if(!$request->has('enabled')) { + if (! $request->has('enabled')) { $request['enabled'] = false; } $item->update($request->all()); return redirect()->route('category.type.item.index', $type->id) - ->with('message', 'Category updated successfully.'); + ->with('message', 'Category updated successfully.'); } /** * Remove the specified resource from storage. * - * @param \BalajiDharma\LaravelCategory\Models\CategoryType $type - * @param \BalajiDharma\LaravelCategory\Models\Category $typeItem + * @param \BalajiDharma\LaravelCategory\Models\Category $typeItem * @return \Illuminate\Http\RedirectResponse */ public function destroy(CategoryType $type, Category $item) @@ -121,6 +116,6 @@ public function destroy(CategoryType $type, Category $item) $item->delete(); return redirect()->route('category.type.item.index', $type->id) - ->with('message', __('Category deleted successfully')); + ->with('message', __('Category deleted successfully')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/CategoryTypeController.php b/app/Http/Controllers/Admin/CategoryTypeController.php index 474f867..20bfbeb 100644 --- a/app/Http/Controllers/Admin/CategoryTypeController.php +++ b/app/Http/Controllers/Admin/CategoryTypeController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; -use BalajiDharma\LaravelCategory\Models\CategoryType; use BalajiDharma\LaravelAdminCore\Requests\StoreCategoryTypeRequest; use BalajiDharma\LaravelAdminCore\Requests\UpdateCategoryTypeRequest; +use BalajiDharma\LaravelCategory\Models\CategoryType; use Illuminate\Support\Facades\Auth; use Inertia\Inertia; @@ -54,7 +54,7 @@ public function index() 'edit' => Auth::user()->can('category.type edit'), 'delete' => Auth::user()->can('category.type delete'), 'manage' => Auth::user()->can('category index'), - ] + ], ]); } @@ -71,12 +71,11 @@ public function create() /** * Store a newly created resource in storage. * - * @param StoreCategoryTypeRequest $request * @return \Illuminate\Http\RedirectResponse */ public function store(StoreCategoryTypeRequest $request) { - if(!$request->has('is_flat')) { + if (! $request->has('is_flat')) { $request['is_flat'] = false; } @@ -88,7 +87,7 @@ public function store(StoreCategoryTypeRequest $request) ]); return redirect()->route('category.type.index') - ->with('message', 'Category type created successfully.'); + ->with('message', 'Category type created successfully.'); } /** @@ -107,20 +106,19 @@ public function edit(CategoryType $type) /** * Update the specified resource in storage. * - * @param UpdateCategoryTypeRequest $request * @param \BalajiDharma\LaravelCategory\Models\CategoryType $categoryType * @return \Illuminate\Http\RedirectResponse */ public function update(UpdateCategoryTypeRequest $request, CategoryType $type) { - if(!$request->has('is_flat')) { + if (! $request->has('is_flat')) { $request['is_flat'] = false; } $type->update($request->all()); return redirect()->route('category.type.index') - ->with('message', 'Category type updated successfully.'); + ->with('message', 'Category type updated successfully.'); } /** @@ -134,6 +132,6 @@ public function destroy(CategoryType $type) $type->delete(); return redirect()->route('category.type.index') - ->with('message', __('Category type deleted successfully')); + ->with('message', __('Category type deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php index d32ae7c..671c1cc 100644 --- a/app/Http/Controllers/Admin/MenuController.php +++ b/app/Http/Controllers/Admin/MenuController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; -use BalajiDharma\LaravelMenu\Models\Menu; use BalajiDharma\LaravelAdminCore\Requests\StoreMenuRequest; use BalajiDharma\LaravelAdminCore\Requests\UpdateMenuRequest; +use BalajiDharma\LaravelMenu\Models\Menu; use Illuminate\Support\Facades\Auth; use Inertia\Inertia; @@ -54,7 +54,7 @@ public function index() 'edit' => Auth::user()->can('menu edit'), 'delete' => Auth::user()->can('menu delete'), 'manage' => Auth::user()->can('menu.item index'), - ] + ], ]); } @@ -71,7 +71,6 @@ public function create() /** * Store a newly created resource in storage. * - * @param StoreMenuRequest $request * @return \Illuminate\Http\RedirectResponse */ public function store(StoreMenuRequest $request) @@ -83,13 +82,12 @@ public function store(StoreMenuRequest $request) ]); return redirect()->route('menu.index') - ->with('message', 'Menu created successfully.'); + ->with('message', 'Menu created successfully.'); } /** * Show the form for editing the specified resource. * - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu * @return \Inertia\Response */ public function edit(Menu $menu) @@ -102,8 +100,6 @@ public function edit(Menu $menu) /** * Update the specified resource in storage. * - * @param UpdateMenuRequest $request - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu * @return \Illuminate\Http\RedirectResponse */ public function update(UpdateMenuRequest $request, Menu $menu) @@ -111,13 +107,12 @@ public function update(UpdateMenuRequest $request, Menu $menu) $menu->update($request->all()); return redirect()->route('menu.index') - ->with('message', 'Menu updated successfully.'); + ->with('message', 'Menu updated successfully.'); } /** * Remove the specified resource from storage. * - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu * @return \Illuminate\Http\RedirectResponse */ public function destroy(Menu $menu) @@ -125,6 +120,6 @@ public function destroy(Menu $menu) $menu->delete(); return redirect()->route('menu.index') - ->with('message', __('Menu deleted successfully')); + ->with('message', __('Menu deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/MenuItemController.php b/app/Http/Controllers/Admin/MenuItemController.php index fb419fe..ff1e515 100644 --- a/app/Http/Controllers/Admin/MenuItemController.php +++ b/app/Http/Controllers/Admin/MenuItemController.php @@ -36,7 +36,7 @@ public function index(Menu $menu) 'create' => Auth::user()->can('menu.item create'), 'edit' => Auth::user()->can('menu.item edit'), 'delete' => Auth::user()->can('menu.item delete'), - ] + ], ]); } @@ -48,17 +48,16 @@ public function index(Menu $menu) public function create(Menu $menu) { $item_options = MenuItem::selectOptions($menu->id, null, true); + return Inertia::render('Admin/Menu/Item/Create', [ 'menu' => $menu, - 'item_options' => $item_options + 'item_options' => $item_options, ]); } /** * Store a newly created resource in storage. * - * @param StoreMenuItemRequest $request - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu * @return \Illuminate\Http\RedirectResponse */ public function store(StoreMenuItemRequest $request, Menu $menu) @@ -66,31 +65,28 @@ public function store(StoreMenuItemRequest $request, Menu $menu) $menu->menuItems()->create($request->all()); return redirect()->route('menu.item.index', $menu->id) - ->with('message', 'Menu created successfully.'); + ->with('message', 'Menu created successfully.'); } /** * Show the form for editing the specified resource. * - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu * @return \Inertia\Response */ public function edit(Menu $menu, MenuItem $item) { $item_options = MenuItem::selectOptions($menu->id, $item->parent_id ?? $item->id); + return Inertia::render('Admin/Menu/Item/Edit', [ 'menu' => $menu, 'item' => $item, - 'item_options' => $item_options + 'item_options' => $item_options, ]); } /** * Update the specified resource in storage. * - * @param UpdateMenuItemRequest $request - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu - * @param \BalajiDharma\LaravelMenu\Models\MenuItem $item * @return \Illuminate\Http\RedirectResponse */ public function update(UpdateMenuItemRequest $request, Menu $menu, MenuItem $item) @@ -98,14 +94,13 @@ public function update(UpdateMenuItemRequest $request, Menu $menu, MenuItem $ite $item->update($request->all()); return redirect()->route('menu.item.index', $menu->id) - ->with('message', 'Menu Item updated successfully.'); + ->with('message', 'Menu Item updated successfully.'); } /** * Remove the specified resource from storage. * - * @param \BalajiDharma\LaravelMenu\Models\Menu $menu - * @param \BalajiDharma\LaravelMenu\Models\MenuItem $menuItem + * @param \BalajiDharma\LaravelMenu\Models\MenuItem $menuItem * @return \Illuminate\Http\RedirectResponse */ public function destroy(Menu $menu, MenuItem $item) @@ -113,6 +108,6 @@ public function destroy(Menu $menu, MenuItem $item) $item->delete(); return redirect()->route('menu.item.index', $menu->id) - ->with('message', __('Menu deleted successfully')); + ->with('message', __('Menu deleted successfully')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/PermissionController.php b/app/Http/Controllers/Admin/PermissionController.php index ce3b61c..fade081 100644 --- a/app/Http/Controllers/Admin/PermissionController.php +++ b/app/Http/Controllers/Admin/PermissionController.php @@ -53,7 +53,7 @@ public function index() 'create' => Auth::user()->can('permission create'), 'edit' => Auth::user()->can('permission edit'), 'delete' => Auth::user()->can('permission delete'), - ] + ], ]); } @@ -70,7 +70,6 @@ public function create() /** * Store a newly created resource in storage. * - * @param StorePermissionRequest $request * @return \Illuminate\Http\RedirectResponse */ public function store(StorePermissionRequest $request) @@ -78,13 +77,12 @@ public function store(StorePermissionRequest $request) Permission::create($request->all()); return redirect()->route('permission.index') - ->with('message', __('Permission created successfully.')); + ->with('message', __('Permission created successfully.')); } /** * Display the specified resource. * - * @param \App\Models\Permission $permission * @return \Inertia\Response */ public function show(Permission $permission) @@ -97,7 +95,6 @@ public function show(Permission $permission) /** * Show the form for editing the specified resource. * - * @param \App\Models\Permission $permission * @return \Inertia\Response */ public function edit(Permission $permission) @@ -110,8 +107,6 @@ public function edit(Permission $permission) /** * Update the specified resource in storage. * - * @param UpdatePermissionRequest $request - * @param \App\Models\Permission $permission * @return \Illuminate\Http\RedirectResponse */ public function update(UpdatePermissionRequest $request, Permission $permission) @@ -119,13 +114,12 @@ public function update(UpdatePermissionRequest $request, Permission $permission) $permission->update($request->all()); return redirect()->route('permission.index') - ->with('message', __('Permission updated successfully.')); + ->with('message', __('Permission updated successfully.')); } /** * Remove the specified resource from storage. * - * @param \App\Models\Permission $permission * @return \Illuminate\Http\RedirectResponse */ public function destroy(Permission $permission) @@ -133,6 +127,6 @@ public function destroy(Permission $permission) $permission->delete(); return redirect()->route('permission.index') - ->with('message', __('Permission deleted successfully')); + ->with('message', __('Permission deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index 84200d2..24a4c82 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -54,7 +54,7 @@ public function index() 'create' => Auth::user()->can('role create'), 'edit' => Auth::user()->can('role edit'), 'delete' => Auth::user()->can('role delete'), - ] + ], ]); } @@ -65,7 +65,7 @@ public function index() */ public function create() { - $permissions = Permission::all()->pluck("name","id"); + $permissions = Permission::all()->pluck('name', 'id'); return Inertia::render('Admin/Role/Create', [ 'permissions' => $permissions, @@ -75,7 +75,6 @@ public function create() /** * Store a newly created resource in storage. * - * @param StoreRoleRequest $request * @return \Illuminate\Http\RedirectResponse */ public function store(StoreRoleRequest $request) @@ -87,18 +86,17 @@ public function store(StoreRoleRequest $request) } return redirect()->route('role.index') - ->with('message', 'Role created successfully.'); + ->with('message', 'Role created successfully.'); } /** * Display the specified resource. * - * @param \App\Models\Role $role * @return \Inertia\Response */ public function show(Role $role) { - $permissions = Permission::all()->pluck("name","id"); + $permissions = Permission::all()->pluck('name', 'id'); $roleHasPermissions = array_column(json_decode($role->permissions, true), 'id'); return Inertia::render('Admin/Role/Show', [ @@ -111,12 +109,11 @@ public function show(Role $role) /** * Show the form for editing the specified resource. * - * @param \App\Models\Role $role * @return \Inertia\Response */ public function edit(Role $role) { - $permissions = Permission::all()->pluck("name","id"); + $permissions = Permission::all()->pluck('name', 'id'); $roleHasPermissions = array_column(json_decode($role->permissions, true), 'id'); return Inertia::render('Admin/Role/Edit', [ @@ -129,8 +126,6 @@ public function edit(Role $role) /** * Update the specified resource in storage. * - * @param UpdateRoleRequest $request - * @param \App\Models\Role $role * @return \Illuminate\Http\RedirectResponse */ public function update(UpdateRoleRequest $request, Role $role) @@ -140,13 +135,12 @@ public function update(UpdateRoleRequest $request, Role $role) $role->syncPermissions($permissions); return redirect()->route('role.index') - ->with('message', 'Role updated successfully.'); + ->with('message', 'Role updated successfully.'); } /** * Remove the specified resource from storage. * - * @param \App\Models\Role $role * @return \Illuminate\Http\RedirectResponse */ public function destroy(Role $role) @@ -154,6 +148,6 @@ public function destroy(Role $role) $role->delete(); return redirect()->route('role.index') - ->with('message', __('Role deleted successfully')); + ->with('message', __('Role deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index b65d7e6..c111916 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -10,9 +10,9 @@ use BalajiDharma\LaravelAdminCore\Requests\StoreUserRequest; use BalajiDharma\LaravelAdminCore\Requests\UpdateUserRequest; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\Rules; -use Illuminate\Support\Facades\Auth; use Inertia\Inertia; class UserController extends Controller @@ -59,7 +59,7 @@ public function index() 'create' => Auth::user()->can('user create'), 'edit' => Auth::user()->can('user edit'), 'delete' => Auth::user()->can('user delete'), - ] + ], ]); } @@ -70,7 +70,7 @@ public function index() */ public function create() { - $roles = Role::all()->pluck("name","id"); + $roles = Role::all()->pluck('name', 'id'); return Inertia::render('Admin/User/Create', [ 'roles' => $roles, @@ -80,8 +80,6 @@ public function create() /** * Store a newly created resource in storage. * - * @param StoreUserRequest $request - * @param CreateUser $createUser * @return \Illuminate\Http\Response */ public function store(StoreUserRequest $request, CreateUser $createUser) @@ -89,18 +87,17 @@ public function store(StoreUserRequest $request, CreateUser $createUser) $createUser->handle((object) $request->all()); return redirect()->route('user.index') - ->with('message', __('User created successfully.')); + ->with('message', __('User created successfully.')); } /** * Display the specified resource. * - * @param \App\Models\User $user * @return \Inertia\Response */ public function show(User $user) { - $roles = Role::all()->pluck("name","id"); + $roles = Role::all()->pluck('name', 'id'); $userHasRoles = array_column(json_decode($user->roles, true), 'id'); return Inertia::render('Admin/User/Show', [ @@ -113,12 +110,11 @@ public function show(User $user) /** * Show the form for editing the specified resource. * - * @param \App\Models\User $user * @return \Inertia\Response */ public function edit(User $user) { - $roles = Role::all()->pluck("name","id"); + $roles = Role::all()->pluck('name', 'id'); $userHasRoles = array_column(json_decode($user->roles, true), 'id'); return Inertia::render('Admin/User/Edit', [ @@ -131,9 +127,6 @@ public function edit(User $user) /** * Update the specified resource in storage. * - * @param UpdateUserRequest $request - * @param \App\Models\User $user - * @param UpdateUser $updateUser * @return \Illuminate\Http\RedirectResponse */ public function update(UpdateUserRequest $request, User $user, UpdateUser $updateUser) @@ -141,13 +134,12 @@ public function update(UpdateUserRequest $request, User $user, UpdateUser $updat $updateUser->handle((object) $request->all(), $user); return redirect()->route('user.index') - ->with('message', __('User updated successfully.')); + ->with('message', __('User updated successfully.')); } /** * Remove the specified resource from storage. * - * @param \App\Models\User $user * @return \Illuminate\Http\RedirectResponse */ public function destroy(User $user) @@ -155,7 +147,7 @@ public function destroy(User $user) $user->delete(); return redirect()->route('user.index') - ->with('message', __('User deleted successfully')); + ->with('message', __('User deleted successfully')); } /** @@ -175,7 +167,6 @@ public function accountInfo() /** * Save the modified personal information for a user. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function accountInfoStore(Request $request) @@ -199,7 +190,6 @@ public function accountInfoStore(Request $request) /** * Save the new password for a user. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function changePasswordStore(Request $request) diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php index ab68c92..0d36b02 100644 --- a/app/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/app/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -28,7 +28,6 @@ public function create() /** * Handle an incoming authentication request. * - * @param \App\Http\Requests\Auth\LoginRequest $request * @return \Illuminate\Http\RedirectResponse */ public function store(LoginRequest $request) @@ -43,7 +42,6 @@ public function store(LoginRequest $request) /** * Destroy an authenticated session. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function destroy(Request $request) diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php index 305376e..f1e72f3 100644 --- a/app/Http/Controllers/Auth/ConfirmablePasswordController.php +++ b/app/Http/Controllers/Auth/ConfirmablePasswordController.php @@ -24,7 +24,6 @@ public function show() /** * Confirm the user's password. * - * @param \Illuminate\Http\Request $request * @return mixed */ public function store(Request $request) diff --git a/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/app/Http/Controllers/Auth/EmailVerificationNotificationController.php index 3362dca..6c7fa80 100644 --- a/app/Http/Controllers/Auth/EmailVerificationNotificationController.php +++ b/app/Http/Controllers/Auth/EmailVerificationNotificationController.php @@ -11,7 +11,6 @@ class EmailVerificationNotificationController extends Controller /** * Send a new email verification notification. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function store(Request $request) diff --git a/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/app/Http/Controllers/Auth/EmailVerificationPromptController.php index 85a9835..b02dd81 100644 --- a/app/Http/Controllers/Auth/EmailVerificationPromptController.php +++ b/app/Http/Controllers/Auth/EmailVerificationPromptController.php @@ -12,7 +12,6 @@ class EmailVerificationPromptController extends Controller /** * Display the email verification prompt. * - * @param \Illuminate\Http\Request $request * @return mixed */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/Auth/NewPasswordController.php b/app/Http/Controllers/Auth/NewPasswordController.php index e38b05c..c34f27b 100644 --- a/app/Http/Controllers/Auth/NewPasswordController.php +++ b/app/Http/Controllers/Auth/NewPasswordController.php @@ -17,7 +17,6 @@ class NewPasswordController extends Controller /** * Display the password reset view. * - * @param \Illuminate\Http\Request $request * @return \Inertia\Response */ public function create(Request $request) @@ -31,7 +30,6 @@ public function create(Request $request) /** * Handle an incoming new password request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse * * @throws \Illuminate\Validation\ValidationException diff --git a/app/Http/Controllers/Auth/PasswordResetLinkController.php b/app/Http/Controllers/Auth/PasswordResetLinkController.php index 84db1a7..790c44a 100644 --- a/app/Http/Controllers/Auth/PasswordResetLinkController.php +++ b/app/Http/Controllers/Auth/PasswordResetLinkController.php @@ -25,7 +25,6 @@ public function create() /** * Handle an incoming password reset link request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse * * @throws \Illuminate\Validation\ValidationException diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 4d27cd6..e074f08 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -27,7 +27,6 @@ public function create() /** * Handle an incoming registration request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse * * @throws \Illuminate\Validation\ValidationException diff --git a/app/Http/Controllers/Auth/VerifyEmailController.php b/app/Http/Controllers/Auth/VerifyEmailController.php index 6baa9aa..7729a5f 100644 --- a/app/Http/Controllers/Auth/VerifyEmailController.php +++ b/app/Http/Controllers/Auth/VerifyEmailController.php @@ -12,7 +12,6 @@ class VerifyEmailController extends Controller /** * Mark the authenticated user's email address as verified. * - * @param \Illuminate\Foundation\Auth\EmailVerificationRequest $request * @return \Illuminate\Http\RedirectResponse */ public function __invoke(EmailVerificationRequest $request) diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index 8668d39..dc7a14c 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -2,10 +2,10 @@ namespace App\Http\Middleware; +use BalajiDharma\LaravelMenu\Models\Menu; use Illuminate\Http\Request; use Inertia\Middleware; use Tightenco\Ziggy\Ziggy; -use BalajiDharma\LaravelMenu\Models\Menu; class HandleInertiaRequests extends Middleware { @@ -19,7 +19,6 @@ class HandleInertiaRequests extends Middleware /** * Determine the current asset version. * - * @param \Illuminate\Http\Request $request * @return string|null */ public function version(Request $request) @@ -30,7 +29,6 @@ public function version(Request $request) /** * Define the props that are shared by default. * - * @param \Illuminate\Http\Request $request * @return array */ public function share(Request $request) @@ -48,8 +46,8 @@ public function share(Request $request) 'message' => fn () => $request->session()->get('message'), ], 'navigation' => [ - 'menu' => Menu::getMenuTree('admin') - ] + 'menu' => Menu::getMenuTree('admin'), + ], ]); } } diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index a2813a0..4e7c24b 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -12,7 +12,6 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @param string|null ...$guards * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse diff --git a/app/Models/User.php b/app/Models/User.php index 409233c..fcb7010 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -10,7 +10,7 @@ class User extends Authenticatable { - use HasApiTokens, HasFactory, Notifiable, HasRoles; + use HasApiTokens, HasFactory, HasRoles, Notifiable; /** * The attributes that are mass assignable. diff --git a/database/seeders/BasicAdminPermissionSeeder.php b/database/seeders/BasicAdminPermissionSeeder.php deleted file mode 100644 index cade11c..0000000 --- a/database/seeders/BasicAdminPermissionSeeder.php +++ /dev/null @@ -1,75 +0,0 @@ -forgetCachedPermissions(); - - // create permissions - $permissions = [ - 'permission list', - 'permission create', - 'permission edit', - 'permission delete', - 'role list', - 'role create', - 'role edit', - 'role delete', - 'user list', - 'user create', - 'user edit', - 'user delete', - ]; - - foreach ($permissions as $permission) { - Permission::create(['name' => $permission]); - } - - // create roles and assign existing permissions - $role1 = Role::create(['name' => 'writer']); - $role1->givePermissionTo('permission list'); - $role1->givePermissionTo('role list'); - $role1->givePermissionTo('user list'); - - $role2 = Role::create(['name' => 'admin']); - foreach ($permissions as $permission) { - $role2->givePermissionTo($permission); - } - - $role3 = Role::create(['name' => 'super-admin']); - // gets all permissions via Gate::before rule; see AuthServiceProvider - - // create demo users - $user = \App\Models\User::factory()->create([ - 'name' => 'Super Admin', - 'email' => 'superadmin@example.com', - ]); - $user->assignRole($role3); - - $user = \App\Models\User::factory()->create([ - 'name' => 'Admin User', - 'email' => 'admin@example.com', - ]); - $user->assignRole($role2); - - $user = \App\Models\User::factory()->create([ - 'name' => 'Example User', - 'email' => 'test@example.com', - ]); - $user->assignRole($role1); - } -} diff --git a/routes/admin.php b/routes/admin.php index b6de05d..8195458 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -9,15 +9,15 @@ Route::resource('role', 'RoleController'); Route::resource('permission', 'PermissionController'); Route::resource('menu', 'MenuController')->except([ - 'show' + 'show', ]); Route::resource('menu.item', 'MenuItemController'); Route::group([ 'prefix' => 'category', - "as"=>"category." + 'as' => 'category.', ], function () { Route::resource('type', 'CategoryTypeController')->except([ - 'show' + 'show', ]); Route::resource('type.item', 'CategoryController'); }); diff --git a/routes/auth.php b/routes/auth.php index 54c9ae1..e11fb1a 100644 --- a/routes/auth.php +++ b/routes/auth.php @@ -12,45 +12,45 @@ Route::middleware('guest')->group(function () { Route::get('register', [RegisteredUserController::class, 'create']) - ->name('register'); + ->name('register'); Route::post('register', [RegisteredUserController::class, 'store']); Route::get('login', [AuthenticatedSessionController::class, 'create']) - ->name('login'); + ->name('login'); Route::post('login', [AuthenticatedSessionController::class, 'store']); Route::get('forgot-password', [PasswordResetLinkController::class, 'create']) - ->name('password.request'); + ->name('password.request'); Route::post('forgot-password', [PasswordResetLinkController::class, 'store']) - ->name('password.email'); + ->name('password.email'); Route::get('reset-password/{token}', [NewPasswordController::class, 'create']) - ->name('password.reset'); + ->name('password.reset'); Route::post('reset-password', [NewPasswordController::class, 'store']) - ->name('password.update'); + ->name('password.update'); }); Route::middleware('auth')->group(function () { Route::get('verify-email', [EmailVerificationPromptController::class, '__invoke']) - ->name('verification.notice'); + ->name('verification.notice'); Route::get('verify-email/{id}/{hash}', [VerifyEmailController::class, '__invoke']) - ->middleware(['signed', 'throttle:6,1']) - ->name('verification.verify'); + ->middleware(['signed', 'throttle:6,1']) + ->name('verification.verify'); Route::post('email/verification-notification', [EmailVerificationNotificationController::class, 'store']) - ->middleware('throttle:6,1') - ->name('verification.send'); + ->middleware('throttle:6,1') + ->name('verification.send'); Route::get('confirm-password', [ConfirmablePasswordController::class, 'show']) - ->name('password.confirm'); + ->name('password.confirm'); Route::post('confirm-password', [ConfirmablePasswordController::class, 'store']); Route::post('logout', [AuthenticatedSessionController::class, 'destroy']) - ->name('logout'); + ->name('logout'); });