Skip to content

Commit d77a9c4

Browse files
balajidharmabalajidharma
committed
Uses laravel/pint for styling
1 parent 4fb8435 commit d77a9c4

File tree

15 files changed

+63
-57
lines changed

15 files changed

+63
-57
lines changed

‎app/Http/Controllers/Admin/PermissionController.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
use App\Http\Requests\Admin\StorePermissionRequest;
77
use App\Http\Requests\Admin\UpdatePermissionRequest;
88
use App\Models\Permission;
9-
use Illuminate\Http\Request;
109
use Inertia\Inertia;
1110

1211
class PermissionController extends Controller
1312
{
14-
function __construct()
13+
public function __construct()
1514
{
16-
$this->middleware('can:permission list', ['only' => ['index','show']]);
17-
$this->middleware('can:permission create', ['only' => ['create','store']]);
18-
$this->middleware('can:permission edit', ['only' => ['edit','update']]);
19-
$this->middleware('can:permission delete', ['only' => ['destroy']]);
15+
$this->middleware('can:permission list', ['only' => ['index', 'show']]);
16+
$this->middleware('can:permission create', ['only' => ['create', 'store']]);
17+
$this->middleware('can:permission edit', ['only' => ['edit', 'update']]);
18+
$this->middleware('can:permission delete', ['only' => ['destroy']]);
2019
}
20+
2121
/**
2222
* Display a listing of the resource.
2323
*
@@ -28,7 +28,7 @@ public function index()
2828
$permissions = (new Permission)->newQuery();
2929

3030
if (request()->has('search')) {
31-
$permissions->where('name', 'Like', '%' . request()->input('search') . '%');
31+
$permissions->where('name', 'Like', '%'.request()->input('search').'%');
3232
}
3333

3434
if (request()->query('sort')) {
@@ -57,7 +57,7 @@ public function index()
5757
*/
5858
public function create()
5959
{
60-
return view('admin.permission.create');
60+
return Inertia::render('Admin/Permission/Create');
6161
}
6262

6363
/**
@@ -82,7 +82,7 @@ public function store(StorePermissionRequest $request)
8282
*/
8383
public function show(Permission $permission)
8484
{
85-
return view('admin.permission.show',compact('permission'));
85+
return view('admin.permission.show', compact('permission'));
8686
}
8787

8888
/**
@@ -93,7 +93,9 @@ public function show(Permission $permission)
9393
*/
9494
public function edit(Permission $permission)
9595
{
96-
return view('admin.permission.edit',compact('permission'));
96+
return Inertia::render('Admin/Permission/Edit', [
97+
'permission' => $permission
98+
]);
9799
}
98100

99101
/**

‎app/Http/Controllers/Admin/RoleController.php

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
use App\Http\Controllers\Controller;
66
use App\Http\Requests\Admin\StoreRoleRequest;
77
use App\Http\Requests\Admin\UpdateRoleRequest;
8-
use App\Models\Role;
98
use App\Models\Permission;
10-
use Illuminate\Http\Request;
9+
use App\Models\Role;
1110

1211
class RoleController extends Controller
1312
{
14-
function __construct()
13+
public function __construct()
1514
{
16-
$this->middleware('can:role list', ['only' => ['index','show']]);
17-
$this->middleware('can:role create', ['only' => ['create','store']]);
18-
$this->middleware('can:role edit', ['only' => ['edit','update']]);
19-
$this->middleware('can:role delete', ['only' => ['destroy']]);
15+
$this->middleware('can:role list', ['only' => ['index', 'show']]);
16+
$this->middleware('can:role create', ['only' => ['create', 'store']]);
17+
$this->middleware('can:role edit', ['only' => ['edit', 'update']]);
18+
$this->middleware('can:role delete', ['only' => ['destroy']]);
2019
}
20+
2121
/**
2222
* Display a listing of the resource.
2323
*
@@ -28,7 +28,7 @@ public function index()
2828
$roles = (new Role)->newQuery();
2929

3030
if (request()->has('search')) {
31-
$roles->where('name', 'Like', '%' . request()->input('search') . '%');
31+
$roles->where('name', 'Like', '%'.request()->input('search').'%');
3232
}
3333

3434
if (request()->query('sort')) {
@@ -45,7 +45,7 @@ public function index()
4545

4646
$roles = $roles->paginate(5);
4747

48-
return view('admin.role.index',compact('roles'))
48+
return view('admin.role.index', compact('roles'))
4949
->with('i', (request()->input('page', 1) - 1) * 5);
5050
}
5151

@@ -57,6 +57,7 @@ public function index()
5757
public function create()
5858
{
5959
$permissions = Permission::all();
60+
6061
return view('admin.role.create', compact('permissions'));
6162
}
6263

@@ -70,12 +71,12 @@ public function store(StoreRoleRequest $request)
7071
{
7172
$role = Role::create($request->all());
7273

73-
if(! empty($request->permissions)) {
74+
if (! empty($request->permissions)) {
7475
$role->givePermissionTo($request->permissions);
7576
}
7677

7778
return redirect()->route('role.index')
78-
->with('message','Role created successfully.');
79+
->with('message', 'Role created successfully.');
7980
}
8081

8182
/**
@@ -88,6 +89,7 @@ public function show(Role $role)
8889
{
8990
$permissions = Permission::all();
9091
$roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');
92+
9193
return view('admin.role.show', compact('role', 'permissions', 'roleHasPermissions'));
9294
}
9395

@@ -119,7 +121,7 @@ public function update(UpdateRoleRequest $request, Role $role)
119121
$role->syncPermissions($permissions);
120122

121123
return redirect()->route('role.index')
122-
->with('message','Role updated successfully.');
124+
->with('message', 'Role updated successfully.');
123125
}
124126

125127
/**
@@ -131,7 +133,7 @@ public function update(UpdateRoleRequest $request, Role $role)
131133
public function destroy(Role $role)
132134
{
133135
$role->delete();
134-
136+
135137
return redirect()->route('role.index')
136138
->with('message', __('Role deleted successfully'));
137139
}

‎app/Http/Controllers/Admin/UserController.php

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@
22

33
namespace App\Http\Controllers\Admin;
44

5+
use App\Actions\Admin\User\CreateUser;
6+
use App\Actions\Admin\User\UpdateUser;
57
use App\Http\Controllers\Controller;
68
use App\Http\Requests\Admin\StoreUserRequest;
79
use App\Http\Requests\Admin\UpdateUserRequest;
8-
use App\Actions\Admin\User\CreateUser;
9-
use App\Actions\Admin\User\UpdateUser;
10-
use App\Models\User;
1110
use App\Models\Role;
11+
use App\Models\User;
1212
use Illuminate\Http\Request;
1313
use Illuminate\Support\Facades\Hash;
1414
use Illuminate\Validation\Rules;
1515

1616
class UserController extends Controller
1717
{
18-
function __construct()
18+
public function __construct()
1919
{
20-
$this->middleware('can:user list', ['only' => ['index','show']]);
21-
$this->middleware('can:user create', ['only' => ['create','store']]);
22-
$this->middleware('can:user edit', ['only' => ['edit','update']]);
23-
$this->middleware('can:user delete', ['only' => ['destroy']]);
20+
$this->middleware('can:user list', ['only' => ['index', 'show']]);
21+
$this->middleware('can:user create', ['only' => ['create', 'store']]);
22+
$this->middleware('can:user edit', ['only' => ['edit', 'update']]);
23+
$this->middleware('can:user delete', ['only' => ['destroy']]);
2424
}
25+
2526
/**
2627
* Display a listing of the resource.
2728
*
@@ -32,7 +33,7 @@ public function index()
3233
$users = (new User)->newQuery();
3334

3435
if (request()->has('search')) {
35-
$users->where('name', 'Like', '%' . request()->input('search') . '%');
36+
$users->where('name', 'Like', '%'.request()->input('search').'%');
3637
}
3738

3839
if (request()->query('sort')) {
@@ -49,7 +50,7 @@ public function index()
4950

5051
$users = $users->paginate(5);
5152

52-
return view('admin.user.index',compact('users'))
53+
return view('admin.user.index', compact('users'))
5354
->with('i', (request()->input('page', 1) - 1) * 5);
5455
}
5556

@@ -61,14 +62,15 @@ public function index()
6162
public function create()
6263
{
6364
$roles = Role::all();
65+
6466
return view('admin.user.create', compact('roles'));
6567
}
6668

6769
/**
6870
* Store a newly created resource in storage.
6971
*
7072
* @param \App\Http\Requests\Admin\StoreUserRequest $request
71-
* @param \App\Actions\Admin\User\CreateUser $createUser
73+
* @param \App\Actions\Admin\User\CreateUser $createUser
7274
* @return \Illuminate\Http\Response
7375
*/
7476
public function store(StoreUserRequest $request, CreateUser $createUser)
@@ -89,6 +91,7 @@ public function show(User $user)
8991
{
9092
$roles = Role::all();
9193
$userHasRoles = array_column(json_decode($user->roles, true), 'id');
94+
9295
return view('admin.user.show', compact('user', 'roles', 'userHasRoles'));
9396
}
9497

@@ -111,7 +114,7 @@ public function edit(User $user)
111114
*
112115
* @param \App\Http\Requests\Admin\UpdateUserRequest $request
113116
* @param \App\Models\User $user
114-
* @param \App\Actions\Admin\User\UpdateUser $updateUser
117+
* @param \App\Actions\Admin\User\UpdateUser $updateUser
115118
* @return \Illuminate\Http\Response
116119
*/
117120
public function update(UpdateUserRequest $request, User $user, UpdateUser $updateUser)
@@ -159,9 +162,9 @@ public function accountInfoStore(Request $request)
159162
$user = \Auth::user()->update($request->except(['_token']));
160163

161164
if ($user) {
162-
$message = "Account updated successfully.";
165+
$message = 'Account updated successfully.';
163166
} else {
164-
$message = "Error while saving. Please try again.";
167+
$message = 'Error while saving. Please try again.';
165168
}
166169

167170
return redirect()->route('admin.account.info')->with('account_message', __($message));
@@ -179,7 +182,9 @@ public function changePasswordStore(Request $request)
179182
]);
180183

181184
$validator->after(function ($validator) use ($request) {
182-
if ($validator->failed()) return;
185+
if ($validator->failed()) {
186+
return;
187+
}
183188
if (! Hash::check($request->input('old_password'), \Auth::user()->password)) {
184189
$validator->errors()->add(
185190
'old_password', __('Old password is incorrect.')
@@ -194,9 +199,9 @@ public function changePasswordStore(Request $request)
194199
]);
195200

196201
if ($user) {
197-
$message = "Password updated successfully.";
202+
$message = 'Password updated successfully.';
198203
} else {
199-
$message = "Error while saving. Please try again.";
204+
$message = 'Error while saving. Please try again.';
200205
}
201206

202207
return redirect()->route('admin.account.info')->with('password_message', __($message));

‎app/Http/Middleware/HandleInertiaRequests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function share(Request $request)
4444
]);
4545
},
4646
'flash' => [
47-
'message' => fn () => $request->session()->get('message')
47+
'message' => fn () => $request->session()->get('message'),
4848
],
4949
]);
5050
}

‎app/Http/Requests/Admin/UpdateUserRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function rules()
2727
return [
2828
'name' => ['required', 'string', 'max:255'],
2929
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email,'.$this->user->id],
30-
'password' => ['nullable','confirmed', Rules\Password::defaults()],
30+
'password' => ['nullable', 'confirmed', Rules\Password::defaults()],
3131
];
3232
}
3333
}

‎app/Models/Permission.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ class Permission extends OriginalPermission
1010
'name',
1111
'guard_name',
1212
'updated_at',
13-
'created_at'
13+
'created_at',
1414
];
1515
}

‎app/Models/Role.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ class Role extends OriginalRole
1010
'name',
1111
'guard_name',
1212
'updated_at',
13-
'created_at'
13+
'created_at',
1414
];
1515
}

‎app/Models/User.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace App\Models;
44

5-
use Illuminate\Contracts\Auth\MustVerifyEmail;
65
use Illuminate\Database\Eloquent\Factories\HasFactory;
76
use Illuminate\Foundation\Auth\User as Authenticatable;
87
use Illuminate\Notifications\Notifiable;

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"require-dev": {
1818
"fakerphp/faker": "^1.9.1",
1919
"laravel/breeze": "^1.10",
20+
"laravel/pint": "^1.0",
2021
"laravel/sail": "^1.0.1",
2122
"mockery/mockery": "^1.4.4",
2223
"nunomaduro/collision": "^6.1",

‎database/migrations/2022_07_11_225131_create_permission_tables.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
use Illuminate\Support\Facades\Schema;
4-
use Illuminate\Database\Schema\Blueprint;
53
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
66
use Spatie\Permission\PermissionRegistrar;
77

88
class CreatePermissionTables extends Migration
@@ -71,7 +71,6 @@ public function up()
7171
$table->primary([PermissionRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
7272
'model_has_permissions_permission_model_type_primary');
7373
}
74-
7574
});
7675

7776
Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $teams) {

0 commit comments

Comments
 (0)