Uses laravel/pint for styling

balajidharma · balajidharma · commit 66042e447c59 · 2022-07-21T19:46:13.000-04:00
diff --git a/app/Actions/Admin/User/CreateUser.php b/app/Actions/Admin/User/CreateUser.php
@@ -1,10 +1,11 @@
 <?php
+
 namespace App\Actions\Admin\User;
- 
+
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
- 
+
 class CreateUser
 {
     public function handle(Request $request): User
@@ -20,4 +21,4 @@ public function handle(Request $request): User
 
         return $user;
     }
-}
+}
diff --git a/app/Actions/Admin/User/UpdateUser.php b/app/Actions/Admin/User/UpdateUser.php
@@ -1,10 +1,11 @@
 <?php
+
 namespace App\Actions\Admin\User;
- 
+
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
- 
+
 class UpdateUser
 {
     public function handle(Request $request, User $user): User
@@ -14,7 +15,7 @@ public function handle(Request $request, User $user): User
             'email' => $request->email,
         ]);
 
-        if($request->password){
+        if ($request->password) {
             $user->update([
                 'password' => Hash::make($request->password),
             ]);
@@ -25,4 +26,4 @@ public function handle(Request $request, User $user): User
 
         return $user;
     }
-}
+}
diff --git a/app/Http/Controllers/Admin/PermissionController.php b/app/Http/Controllers/Admin/PermissionController.php
@@ -6,17 +6,17 @@
 use App\Http\Requests\Admin\StorePermissionRequest;
 use App\Http\Requests\Admin\UpdatePermissionRequest;
 use App\Models\Permission;
-use Illuminate\Http\Request;
 
 class PermissionController extends Controller
 {
-    function __construct()
+    public function __construct()
     {
-         $this->middleware('can:permission list', ['only' => ['index','show']]);
-         $this->middleware('can:permission create', ['only' => ['create','store']]);
-         $this->middleware('can:permission edit', ['only' => ['edit','update']]);
-         $this->middleware('can:permission delete', ['only' => ['destroy']]);
+        $this->middleware('can:permission list', ['only' => ['index', 'show']]);
+        $this->middleware('can:permission create', ['only' => ['create', 'store']]);
+        $this->middleware('can:permission edit', ['only' => ['edit', 'update']]);
+        $this->middleware('can:permission delete', ['only' => ['destroy']]);
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -27,7 +27,7 @@ public function index()
         $permissions = (new Permission)->newQuery();
 
         if (request()->has('search')) {
-            $permissions->where('name', 'Like', '%' . request()->input('search') . '%');
+            $permissions->where('name', 'Like', '%'.request()->input('search').'%');
         }
 
         if (request()->query('sort')) {
@@ -79,7 +79,7 @@ public function store(StorePermissionRequest $request)
      */
     public function show(Permission $permission)
     {
-        return view('admin.permission.show',compact('permission'));
+        return view('admin.permission.show', compact('permission'));
     }
 
     /**
@@ -90,7 +90,7 @@ public function show(Permission $permission)
      */
     public function edit(Permission $permission)
     {
-        return view('admin.permission.edit',compact('permission'));
+        return view('admin.permission.edit', compact('permission'));
     }
 
     /**
@@ -117,7 +117,7 @@ public function update(UpdatePermissionRequest $request, Permission $permission)
     public function destroy(Permission $permission)
     {
         $permission->delete();
-    
+
         return redirect()->route('permission.index')
                         ->with('message', __('Permission deleted successfully'));
     }
diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php
@@ -5,19 +5,19 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\StoreRoleRequest;
 use App\Http\Requests\Admin\UpdateRoleRequest;
-use App\Models\Role;
 use App\Models\Permission;
-use Illuminate\Http\Request;
+use App\Models\Role;
 
 class RoleController extends Controller
 {
-    function __construct()
+    public function __construct()
     {
-         $this->middleware('can:role list', ['only' => ['index','show']]);
-         $this->middleware('can:role create', ['only' => ['create','store']]);
-         $this->middleware('can:role edit', ['only' => ['edit','update']]);
-         $this->middleware('can:role delete', ['only' => ['destroy']]);
+        $this->middleware('can:role list', ['only' => ['index', 'show']]);
+        $this->middleware('can:role create', ['only' => ['create', 'store']]);
+        $this->middleware('can:role edit', ['only' => ['edit', 'update']]);
+        $this->middleware('can:role delete', ['only' => ['destroy']]);
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -28,7 +28,7 @@ public function index()
         $roles = (new Role)->newQuery();
 
         if (request()->has('search')) {
-            $roles->where('name', 'Like', '%' . request()->input('search') . '%');
+            $roles->where('name', 'Like', '%'.request()->input('search').'%');
         }
 
         if (request()->query('sort')) {
@@ -56,6 +56,7 @@ public function index()
     public function create()
     {
         $permissions = Permission::all();
+
         return view('admin.role.create', compact('permissions'));
     }
 
@@ -69,12 +70,12 @@ public function store(StoreRoleRequest $request)
     {
         $role = Role::create($request->all());
 
-        if(! empty($request->permissions)) {
+        if (! empty($request->permissions)) {
             $role->givePermissionTo($request->permissions);
         }
 
         return redirect()->route('role.index')
-                        ->with('message','Role created successfully.');
+                        ->with('message', 'Role created successfully.');
     }
 
     /**
@@ -87,6 +88,7 @@ public function show(Role $role)
     {
         $permissions = Permission::all();
         $roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');
+
         return view('admin.role.show', compact('role', 'permissions', 'roleHasPermissions'));
     }
 
@@ -118,7 +120,7 @@ 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.');
     }
 
     /**
@@ -130,7 +132,7 @@ public function update(UpdateRoleRequest $request, Role $role)
     public function destroy(Role $role)
     {
         $role->delete();
-    
+
         return redirect()->route('role.index')
                         ->with('message', __('Role deleted successfully'));
     }
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -2,26 +2,27 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Actions\Admin\User\CreateUser;
+use App\Actions\Admin\User\UpdateUser;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\StoreUserRequest;
 use App\Http\Requests\Admin\UpdateUserRequest;
-use App\Actions\Admin\User\CreateUser;
-use App\Actions\Admin\User\UpdateUser;
-use App\Models\User;
 use App\Models\Role;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules;
 
 class UserController extends Controller
 {
-    function __construct()
+    public function __construct()
     {
-         $this->middleware('can:user list', ['only' => ['index','show']]);
-         $this->middleware('can:user create', ['only' => ['create','store']]);
-         $this->middleware('can:user edit', ['only' => ['edit','update']]);
-         $this->middleware('can:user delete', ['only' => ['destroy']]);
+        $this->middleware('can:user list', ['only' => ['index', 'show']]);
+        $this->middleware('can:user create', ['only' => ['create', 'store']]);
+        $this->middleware('can:user edit', ['only' => ['edit', 'update']]);
+        $this->middleware('can:user delete', ['only' => ['destroy']]);
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -32,7 +33,7 @@ public function index()
         $users = (new User)->newQuery();
 
         if (request()->has('search')) {
-            $users->where('name', 'Like', '%' . request()->input('search') . '%');
+            $users->where('name', 'Like', '%'.request()->input('search').'%');
         }
 
         if (request()->query('sort')) {
@@ -60,14 +61,15 @@ public function index()
     public function create()
     {
         $roles = Role::all();
+
         return view('admin.user.create', compact('roles'));
     }
 
     /**
      * Store a newly created resource in storage.
      *
      * @param  \App\Http\Requests\Admin\StoreUserRequest  $request
-     * @param  \App\Actions\Admin\User\CreateUser $createUser
+     * @param  \App\Actions\Admin\User\CreateUser  $createUser
      * @return \Illuminate\Http\Response
      */
     public function store(StoreUserRequest $request, CreateUser $createUser)
@@ -88,6 +90,7 @@ public function show(User $user)
     {
         $roles = Role::all();
         $userHasRoles = array_column(json_decode($user->roles, true), 'id');
+
         return view('admin.user.show', compact('user', 'roles', 'userHasRoles'));
     }
 
@@ -110,7 +113,7 @@ public function edit(User $user)
      *
      * @param  \App\Http\Requests\Admin\UpdateUserRequest  $request
      * @param  \App\Models\User  $user
-     * @param  \App\Actions\Admin\User\UpdateUser $updateUser
+     * @param  \App\Actions\Admin\User\UpdateUser  $updateUser
      * @return \Illuminate\Http\Response
      */
     public function update(UpdateUserRequest $request, User $user, UpdateUser $updateUser)
@@ -158,9 +161,9 @@ public function accountInfoStore(Request $request)
         $user = \Auth::user()->update($request->except(['_token']));
 
         if ($user) {
-            $message = "Account updated successfully.";
+            $message = 'Account updated successfully.';
         } else {
-            $message = "Error while saving. Please try again.";
+            $message = 'Error while saving. Please try again.';
         }
 
         return redirect()->route('admin.account.info')->with('account_message', __($message));
@@ -178,7 +181,9 @@ public function changePasswordStore(Request $request)
         ]);
 
         $validator->after(function ($validator) use ($request) {
-            if ($validator->failed()) return;
+            if ($validator->failed()) {
+                return;
+            }
             if (! Hash::check($request->input('old_password'), \Auth::user()->password)) {
                 $validator->errors()->add(
                     'old_password', __('Old password is incorrect.')
@@ -193,9 +198,9 @@ public function changePasswordStore(Request $request)
         ]);
 
         if ($user) {
-            $message = "Password updated successfully.";
+            $message = 'Password updated successfully.';
         } else {
-            $message = "Error while saving. Please try again.";
+            $message = 'Error while saving. Please try again.';
         }
 
         return redirect()->route('admin.account.info')->with('password_message', __($message));
diff --git a/app/Http/Requests/Admin/UpdateUserRequest.php b/app/Http/Requests/Admin/UpdateUserRequest.php
@@ -27,7 +27,7 @@ public function rules()
         return [
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email,'.$this->user->id],
-            'password' => ['nullable','confirmed', Rules\Password::defaults()],
+            'password' => ['nullable', 'confirmed', Rules\Password::defaults()],
         ];
     }
 }
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
@@ -10,6 +10,6 @@ class Permission extends OriginalPermission
         'name',
         'guard_name',
         'updated_at',
-        'created_at'
+        'created_at',
     ];
 }
diff --git a/app/Models/Role.php b/app/Models/Role.php
@@ -10,6 +10,6 @@ class Role extends OriginalRole
         'name',
         'guard_name',
         'updated_at',
-        'created_at'
+        'created_at',
     ];
 }
diff --git 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/composer.json b/composer.json
@@ -15,6 +15,7 @@
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/breeze": "^1.7",
+        "laravel/pint": "^1.0",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^6.1",
diff --git a/database/migrations/2022_02_08_033617_create_permission_tables.php b/database/migrations/2022_02_08_033617_create_permission_tables.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Spatie\Permission\PermissionRegistrar;
 
 class CreatePermissionTables extends Migration
@@ -71,7 +71,6 @@ public function up()
                 $table->primary([PermissionRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
                     'model_has_permissions_permission_model_type_primary');
             }
-
         });
 
         Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $teams) {
diff --git a/database/seeders/BasicAdminPermissionSeeder.php b/database/seeders/BasicAdminPermissionSeeder.php
@@ -32,8 +32,8 @@ public function run()
             'user list',
             'user create',
             'user edit',
-            'user delete'
-         ];
+            'user delete',
+        ];
 
         foreach ($permissions as $permission) {
             Permission::create(['name' => $permission]);
diff --git a/package.json b/package.json
@@ -9,11 +9,11 @@
         "alpinejs": "^3.4.2",
         "autoprefixer": "^10.4.2",
         "axios": "^0.27",
-        "laravel-vite-plugin": "^0.4.0",
+        "laravel-vite-plugin": "^0.5.0",
         "lodash": "^4.17.19",
         "postcss": "^8.4.6",
         "postcss-import": "^14.0.1",
         "tailwindcss": "^3.1.6",
-        "vite": "^2.9.13"
+        "vite": "^3.0.0"
     }
 }
diff --git a/routes/admin.php b/routes/admin.php
diff --git a/server.php b/server.php
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,17 @@`
`6`	`6`	`use App\Http\Requests\Admin\StorePermissionRequest;`
`7`	`7`	`use App\Http\Requests\Admin\UpdatePermissionRequest;`
`8`	`8`	`use App\Models\Permission;`
`9`		`-use Illuminate\Http\Request;`
`10`	`9`
`11`	`10`	`class PermissionController extends Controller`
`12`	`11`	`{`
`13`		`- function __construct()`
	`12`	`+ public function __construct()`
`14`	`13`	`{`
`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']]);`
	`14`	`+ $this->middleware('can:permission list', ['only' => ['index', 'show']]);`
	`15`	`+ $this->middleware('can:permission create', ['only' => ['create', 'store']]);`
	`16`	`+ $this->middleware('can:permission edit', ['only' => ['edit', 'update']]);`
	`17`	`+ $this->middleware('can:permission delete', ['only' => ['destroy']]);`
`19`	`18`	`}`
	`19`	`+`
`20`	`20`	`/**`
`21`	`21`	`* Display a listing of the resource.`
`22`	`22`	`*`
`@@ -27,7 +27,7 @@ public function index()`
`27`	`27`	`$permissions = (new Permission)->newQuery();`
`28`	`28`
`29`	`29`	`if (request()->has('search')) {`
`30`		`- $permissions->where('name', 'Like', '%' . request()->input('search') . '%');`
	`30`	`+ $permissions->where('name', 'Like', '%'.request()->input('search').'%');`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if (request()->query('sort')) {`
`@@ -79,7 +79,7 @@ public function store(StorePermissionRequest $request)`
`79`	`79`	`*/`
`80`	`80`	`public function show(Permission $permission)`
`81`	`81`	`{`
`82`		`- return view('admin.permission.show',compact('permission'));`
	`82`	`+ return view('admin.permission.show', compact('permission'));`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`
`@@ -90,7 +90,7 @@ public function show(Permission $permission)`
`90`	`90`	`*/`
`91`	`91`	`public function edit(Permission $permission)`
`92`	`92`	`{`
`93`		`- return view('admin.permission.edit',compact('permission'));`
	`93`	`+ return view('admin.permission.edit', compact('permission'));`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/**`
`@@ -117,7 +117,7 @@ public function update(UpdatePermissionRequest $request, Permission $permission)`
`117`	`117`	`public function destroy(Permission $permission)`
`118`	`118`	`{`
`119`	`119`	`$permission->delete();`
`120`		`-`
	`120`	`+`
`121`	`121`	`return redirect()->route('permission.index')`
`122`	`122`	`->with('message', __('Permission deleted successfully'));`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,19 @@`
`5`	`5`	`use App\Http\Controllers\Controller;`
`6`	`6`	`use App\Http\Requests\Admin\StoreRoleRequest;`
`7`	`7`	`use App\Http\Requests\Admin\UpdateRoleRequest;`
`8`		`-use App\Models\Role;`
`9`	`8`	`use App\Models\Permission;`
`10`		`-use Illuminate\Http\Request;`
	`9`	`+use App\Models\Role;`
`11`	`10`
`12`	`11`	`class RoleController extends Controller`
`13`	`12`	`{`
`14`		`- function __construct()`
	`13`	`+ public function __construct()`
`15`	`14`	`{`
`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']]);`
`20`	`19`	`}`
	`20`	`+`
`21`	`21`	`/**`
`22`	`22`	`* Display a listing of the resource.`
`23`	`23`	`*`
`@@ -28,7 +28,7 @@ public function index()`
`28`	`28`	`$roles = (new Role)->newQuery();`
`29`	`29`
`30`	`30`	`if (request()->has('search')) {`
`31`		`- $roles->where('name', 'Like', '%' . request()->input('search') . '%');`
	`31`	`+ $roles->where('name', 'Like', '%'.request()->input('search').'%');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (request()->query('sort')) {`
`@@ -56,6 +56,7 @@ public function index()`
`56`	`56`	`public function create()`
`57`	`57`	`{`
`58`	`58`	`$permissions = Permission::all();`
	`59`	`+`
`59`	`60`	`return view('admin.role.create', compact('permissions'));`
`60`	`61`	`}`
`61`	`62`
`@@ -69,12 +70,12 @@ public function store(StoreRoleRequest $request)`
`69`	`70`	`{`
`70`	`71`	`$role = Role::create($request->all());`
`71`	`72`
`72`		`- if(! empty($request->permissions)) {`
	`73`	`+ if (! empty($request->permissions)) {`
`73`	`74`	`$role->givePermissionTo($request->permissions);`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`return redirect()->route('role.index')`
`77`		`- ->with('message','Role created successfully.');`
	`78`	`+ ->with('message', 'Role created successfully.');`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`/**`
`@@ -87,6 +88,7 @@ public function show(Role $role)`
`87`	`88`	`{`
`88`	`89`	`$permissions = Permission::all();`
`89`	`90`	`$roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');`
	`91`	`+`
`90`	`92`	`return view('admin.role.show', compact('role', 'permissions', 'roleHasPermissions'));`
`91`	`93`	`}`
`92`	`94`
`@@ -118,7 +120,7 @@ public function update(UpdateRoleRequest $request, Role $role)`
`118`	`120`	`$role->syncPermissions($permissions);`
`119`	`121`
`120`	`122`	`return redirect()->route('role.index')`
`121`		`- ->with('message','Role updated successfully.');`
	`123`	`+ ->with('message', 'Role updated successfully.');`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`/**`
`@@ -130,7 +132,7 @@ public function update(UpdateRoleRequest $request, Role $role)`
`130`	`132`	`public function destroy(Role $role)`
`131`	`133`	`{`
`132`	`134`	`$role->delete();`
`133`		`-`
	`135`	`+`
`134`	`136`	`return redirect()->route('role.index')`
`135`	`137`	`->with('message', __('Role deleted successfully'));`
`136`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function rules()`
`27`	`27`	`return [`
`28`	`28`	`'name' => ['required', 'string', 'max:255'],`
`29`	`29`	`'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()],`
`31`	`31`	`];`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ class Permission extends OriginalPermission`
`10`	`10`	`'name',`
`11`	`11`	`'guard_name',`
`12`	`12`	`'updated_at',`
`13`		`- 'created_at'`
	`13`	`+ 'created_at',`
`14`	`14`	`];`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ class Role extends OriginalRole`
`10`	`10`	`'name',`
`11`	`11`	`'guard_name',`
`12`	`12`	`'updated_at',`
`13`		`- 'created_at'`
	`13`	`+ 'created_at',`
`14`	`14`	`];`
`15`	`15`	`}`