From 324a2e9d8346652d454b4e55e88eccd3d695833c Mon Sep 17 00:00:00 2001 From: balajidharma Date: Sun, 14 Jan 2024 13:05:36 -0500 Subject: [PATCH] Updated route group as admin --- app/Http/Controllers/Admin/CategoryController.php | 6 +++--- .../Controllers/Admin/CategoryTypeController.php | 6 +++--- app/Http/Controllers/Admin/MenuController.php | 6 +++--- app/Http/Controllers/Admin/MenuItemController.php | 6 +++--- app/Http/Controllers/Admin/PermissionController.php | 6 +++--- app/Http/Controllers/Admin/RoleController.php | 6 +++--- app/Http/Controllers/Admin/UserController.php | 8 ++++---- resources/js/Components/Admin/CategoryItemList.vue | 2 +- resources/js/Components/Admin/MenuItemList.vue | 2 +- resources/js/Layouts/Authenticated.vue | 6 +++--- resources/js/Pages/Admin/Category/Item/Create.vue | 4 ++-- resources/js/Pages/Admin/Category/Item/Edit.vue | 4 ++-- resources/js/Pages/Admin/Category/Item/Index.vue | 6 +++--- resources/js/Pages/Admin/Category/Type/Create.vue | 4 ++-- resources/js/Pages/Admin/Category/Type/Edit.vue | 4 ++-- resources/js/Pages/Admin/Category/Type/Index.vue | 10 +++++----- resources/js/Pages/Admin/Menu/Edit.vue | 4 ++-- resources/js/Pages/Admin/Menu/Index.vue | 10 +++++----- resources/js/Pages/Admin/Menu/Item/Create.vue | 4 ++-- resources/js/Pages/Admin/Menu/Item/Edit.vue | 4 ++-- resources/js/Pages/Admin/Menu/Item/Index.vue | 6 +++--- resources/js/Pages/Admin/Permission/Create.vue | 4 ++-- resources/js/Pages/Admin/Permission/Edit.vue | 4 ++-- resources/js/Pages/Admin/Permission/Index.vue | 10 +++++----- resources/js/Pages/Admin/Permission/Show.vue | 2 +- resources/js/Pages/Admin/Role/Create.vue | 4 ++-- resources/js/Pages/Admin/Role/Edit.vue | 4 ++-- resources/js/Pages/Admin/Role/Index.vue | 10 +++++----- resources/js/Pages/Admin/Role/Show.vue | 2 +- resources/js/Pages/Admin/User/AccountInfo.vue | 2 +- resources/js/Pages/Admin/User/Create.vue | 4 ++-- resources/js/Pages/Admin/User/Edit.vue | 4 ++-- resources/js/Pages/Admin/User/Index.vue | 10 +++++----- resources/js/Pages/Admin/User/Show.vue | 2 +- resources/js/Pages/Welcome.vue | 2 +- resources/js/Stores/main.js | 2 +- routes/admin.php | 12 +++++++++--- routes/web.php | 4 ---- 38 files changed, 99 insertions(+), 97 deletions(-) diff --git a/app/Http/Controllers/Admin/CategoryController.php b/app/Http/Controllers/Admin/CategoryController.php index bdfdadc..65cfbb6 100644 --- a/app/Http/Controllers/Admin/CategoryController.php +++ b/app/Http/Controllers/Admin/CategoryController.php @@ -68,7 +68,7 @@ public function store(StoreCategoryRequest $request, CategoryType $type) $type->categories()->create($request->all()); - return redirect()->route('category.type.item.index', $type->id) + return redirect()->route('admin.category.type.item.index', $type->id) ->with('message', 'Category created successfully.'); } @@ -101,7 +101,7 @@ public function update(UpdateCategoryRequest $request, CategoryType $type, Categ $item->update($request->all()); - return redirect()->route('category.type.item.index', $type->id) + return redirect()->route('admin.category.type.item.index', $type->id) ->with('message', 'Category updated successfully.'); } @@ -115,7 +115,7 @@ public function destroy(CategoryType $type, Category $item) { $item->delete(); - return redirect()->route('category.type.item.index', $type->id) + return redirect()->route('admin.category.type.item.index', $type->id) ->with('message', __('Category deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/CategoryTypeController.php b/app/Http/Controllers/Admin/CategoryTypeController.php index 20bfbeb..88be931 100644 --- a/app/Http/Controllers/Admin/CategoryTypeController.php +++ b/app/Http/Controllers/Admin/CategoryTypeController.php @@ -86,7 +86,7 @@ public function store(StoreCategoryTypeRequest $request) 'is_flat' => $request->is_flat, ]); - return redirect()->route('category.type.index') + return redirect()->route('admin.category.type.index') ->with('message', 'Category type created successfully.'); } @@ -117,7 +117,7 @@ public function update(UpdateCategoryTypeRequest $request, CategoryType $type) $type->update($request->all()); - return redirect()->route('category.type.index') + return redirect()->route('admin.category.type.index') ->with('message', 'Category type updated successfully.'); } @@ -131,7 +131,7 @@ public function destroy(CategoryType $type) { $type->delete(); - return redirect()->route('category.type.index') + return redirect()->route('admin.category.type.index') ->with('message', __('Category type deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php index 671c1cc..24afa08 100644 --- a/app/Http/Controllers/Admin/MenuController.php +++ b/app/Http/Controllers/Admin/MenuController.php @@ -81,7 +81,7 @@ public function store(StoreMenuRequest $request) 'description' => $request->description, ]); - return redirect()->route('menu.index') + return redirect()->route('admin.menu.index') ->with('message', 'Menu created successfully.'); } @@ -106,7 +106,7 @@ public function update(UpdateMenuRequest $request, Menu $menu) { $menu->update($request->all()); - return redirect()->route('menu.index') + return redirect()->route('admin.menu.index') ->with('message', 'Menu updated successfully.'); } @@ -119,7 +119,7 @@ public function destroy(Menu $menu) { $menu->delete(); - return redirect()->route('menu.index') + return redirect()->route('admin.menu.index') ->with('message', __('Menu deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/MenuItemController.php b/app/Http/Controllers/Admin/MenuItemController.php index ff1e515..05cb7ca 100644 --- a/app/Http/Controllers/Admin/MenuItemController.php +++ b/app/Http/Controllers/Admin/MenuItemController.php @@ -64,7 +64,7 @@ public function store(StoreMenuItemRequest $request, Menu $menu) { $menu->menuItems()->create($request->all()); - return redirect()->route('menu.item.index', $menu->id) + return redirect()->route('admin.menu.item.index', $menu->id) ->with('message', 'Menu created successfully.'); } @@ -93,7 +93,7 @@ public function update(UpdateMenuItemRequest $request, Menu $menu, MenuItem $ite { $item->update($request->all()); - return redirect()->route('menu.item.index', $menu->id) + return redirect()->route('admin.menu.item.index', $menu->id) ->with('message', 'Menu Item updated successfully.'); } @@ -107,7 +107,7 @@ public function destroy(Menu $menu, MenuItem $item) { $item->delete(); - return redirect()->route('menu.item.index', $menu->id) + return redirect()->route('admin.menu.item.index', $menu->id) ->with('message', __('Menu deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/PermissionController.php b/app/Http/Controllers/Admin/PermissionController.php index fade081..ab7b892 100644 --- a/app/Http/Controllers/Admin/PermissionController.php +++ b/app/Http/Controllers/Admin/PermissionController.php @@ -76,7 +76,7 @@ public function store(StorePermissionRequest $request) { Permission::create($request->all()); - return redirect()->route('permission.index') + return redirect()->route('admin.permission.index') ->with('message', __('Permission created successfully.')); } @@ -113,7 +113,7 @@ public function update(UpdatePermissionRequest $request, Permission $permission) { $permission->update($request->all()); - return redirect()->route('permission.index') + return redirect()->route('admin.permission.index') ->with('message', __('Permission updated successfully.')); } @@ -126,7 +126,7 @@ public function destroy(Permission $permission) { $permission->delete(); - return redirect()->route('permission.index') + return redirect()->route('admin.permission.index') ->with('message', __('Permission deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index 24a4c82..d6d2a3d 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -85,7 +85,7 @@ public function store(StoreRoleRequest $request) $role->givePermissionTo($request->permissions); } - return redirect()->route('role.index') + return redirect()->route('admin.role.index') ->with('message', 'Role created successfully.'); } @@ -134,7 +134,7 @@ public function update(UpdateRoleRequest $request, Role $role) $permissions = $request->permissions ?? []; $role->syncPermissions($permissions); - return redirect()->route('role.index') + return redirect()->route('admin.role.index') ->with('message', 'Role updated successfully.'); } @@ -147,7 +147,7 @@ public function destroy(Role $role) { $role->delete(); - return redirect()->route('role.index') + return redirect()->route('admin.role.index') ->with('message', __('Role deleted successfully')); } } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index c111916..4cf5518 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -80,13 +80,13 @@ public function create() /** * Store a newly created resource in storage. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ public function store(StoreUserRequest $request, CreateUser $createUser) { $createUser->handle((object) $request->all()); - return redirect()->route('user.index') + return redirect()->route('admin.user.index') ->with('message', __('User created successfully.')); } @@ -133,7 +133,7 @@ public function update(UpdateUserRequest $request, User $user, UpdateUser $updat { $updateUser->handle((object) $request->all(), $user); - return redirect()->route('user.index') + return redirect()->route('admin.user.index') ->with('message', __('User updated successfully.')); } @@ -146,7 +146,7 @@ public function destroy(User $user) { $user->delete(); - return redirect()->route('user.index') + return redirect()->route('admin.user.index') ->with('message', __('User deleted successfully')); } diff --git a/resources/js/Components/Admin/CategoryItemList.vue b/resources/js/Components/Admin/CategoryItemList.vue index 5ebe6c6..8bc6641 100644 --- a/resources/js/Components/Admin/CategoryItemList.vue +++ b/resources/js/Components/Admin/CategoryItemList.vue @@ -45,7 +45,7 @@ const props = defineProps({
- +
diff --git a/resources/js/Pages/Admin/Category/Item/Create.vue b/resources/js/Pages/Admin/Category/Item/Create.vue index ba73858..871c573 100644 --- a/resources/js/Pages/Admin/Category/Item/Create.vue +++ b/resources/js/Pages/Admin/Category/Item/Create.vue @@ -45,7 +45,7 @@ const form = useForm({ main > @@ -57,7 +57,7 @@ function destroy(id) { > -
+
@@ -57,7 +57,7 @@ function destroy(id) { > - +
@@ -56,7 +56,7 @@ function destroy(id) { > - +
@@ -56,7 +56,7 @@ function destroy(id) { > - +
@@ -56,7 +56,7 @@ function destroy(id) { > - +
Dashboard diff --git a/resources/js/Stores/main.js b/resources/js/Stores/main.js index cb3dfff..b07e30b 100644 --- a/resources/js/Stores/main.js +++ b/resources/js/Stores/main.js @@ -30,7 +30,7 @@ export const useMainStore = defineStore('main', { fetch (sampleDataKey) { axios - .get(`data-sources/${sampleDataKey}.json`) + .get(`/data-sources/${sampleDataKey}.json`) .then(r => { if (r.data && r.data.data) { this[sampleDataKey] = r.data.data diff --git a/routes/admin.php b/routes/admin.php index 8195458..d5ac457 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -1,10 +1,16 @@ 'App\Http\Controllers\Admin', 'prefix' => config('admin.prefix'), 'middleware' => ['auth'], + 'as' => 'admin.', ], function () { + Route::get('/', function () { + return Inertia::render('Dashboard'); + })->name('dashboard'); Route::resource('user', 'UserController'); Route::resource('role', 'RoleController'); Route::resource('permission', 'PermissionController'); @@ -21,7 +27,7 @@ ]); Route::resource('type.item', 'CategoryController'); }); - Route::get('edit-account-info', 'UserController@accountInfo')->name('admin.account.info'); - Route::post('edit-account-info', 'UserController@accountInfoStore')->name('admin.account.info.store'); - Route::post('change-password', 'UserController@changePasswordStore')->name('admin.account.password.store'); + Route::get('edit-account-info', 'UserController@accountInfo')->name('account.info'); + Route::post('edit-account-info', 'UserController@accountInfoStore')->name('account.info.store'); + Route::post('change-password', 'UserController@changePasswordStore')->name('account.password.store'); }); diff --git a/routes/web.php b/routes/web.php index 2f15d0e..9add5d7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -24,8 +24,4 @@ ]); }); -Route::get('/dashboard', function () { - return Inertia::render('Dashboard'); -})->middleware(['auth', 'verified'])->name('dashboard'); - require __DIR__.'/auth.php';