Merge pull request #12 from balajidharma/1.x

merge changes

Author: balajidharma

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Balaji Dharma
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -5,16 +5,40 @@
 <a href="https://packagist.org/packages/balajidharma/basic-laravel-admin-panel"><img src="https://poser.pugx.org/balajidharma/basic-laravel-admin-panel/v/stable" alt="Latest Stable Version"></a>
 <a href="https://packagist.org/packages/balajidharma/basic-laravel-admin-panel"><img src="https://poser.pugx.org/balajidharma/basic-laravel-admin-panel/license" alt="License"></a>
 </p>
-<p align="center"><img src="https://miro.medium.com/max/1400/1*3eXlUx9DnzjgXX_1PJ_qWw.png" width="600"></a>
+
+## Built with
+- [Laravel 9](https://github.com/laravel/framework)
+- [spatie/laravel-permission](https://github.com/spatie/laravel-permission)
+- [Laravel Breeze](https://github.com/laravel/breeze)
+- [Tailwind CSS](https://tailwindcss.com/)
+
 
 ## Installation
-- Clone the repository with __git clone__
-- `./vendor/bin/sail up`
-- `sail artisan breeze:install`
-- `sail artisan vendor:publish --provider="Spatie\Permission\PermissionServiceProvider"`
-- `npm install && npm run dev`
-- `sail artisan migrate --seed --seeder=BasicAdminPermissionSeeder`
+- To get started, you need to install [Docker Desktop](https://www.docker.com/products/docker-desktop).
+- You may run the following command in your terminal
+- Windows open WSL2 Linux terminal. [Docker Desktop WSL 2 backend](https://docs.docker.com/desktop/windows/wsl/)
+- `docker run --rm -v "$(pwd)":/opt -w /opt laravelsail/php81-composer:latest bash -c "composer create-project balajidharma/basic-laravel-admin-panel admin-app && cd admin-app && php ./artisan sail:install --with=mysql,redis,meilisearch,mailhog,selenium"`
+- `cd admin-app && ./vendor/bin/sail up`
+- `./vendor/bin/sail npm install`
+- `./vendor/bin/sail npm run dev`
+- `./vendor/bin/sail artisan migrate --seed --seeder=BasicAdminPermissionSeeder`
+- Now open http://localhost/
+
+###### Super Admin Login
+- Email - [email protected]
+- Password - password
+
+## Screenshots
+<p align="center">
+	<img src="https://miro.medium.com/max/700/1*Wk4WaomlQ4v_GKUY2AhcXw.png" >
+	<br/><br/>
+	<img src="https://miro.medium.com/max/700/1*3eXlUx9DnzjgXX_1PJ_qWw.png" >
+	<br/><br/>
+	<img src="https://miro.medium.com/max/700/1*jtzIchs6RP-leKp3nugdZw.png" >
+    <br/><br/>
+	<img src="https://miro.medium.com/max/700/1*4LFqQCnriBDipDpbvcnCzw.png">
+</p>
 
 ## License
 
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

app/Actions/Admin/User/CreateUser.php

@@ -0,0 +1,23 @@
+<?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
+    {
+        $user = User::create([
+            'name' => $request->name,
+            'email' => $request->email,
+            'password' => Hash::make($request->password),
+        ]);
+
+        $roles = $request->roles ?? [];
+        $user->assignRole($roles);
+
+        return $user;
+    }
+}

app/Actions/Admin/User/UpdateUser.php

@@ -0,0 +1,28 @@
+<?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
+    {
+        $user->update([
+            'name' => $request->name,
+            'email' => $request->email,
+        ]);
+
+        if($request->password){
+            $user->update([
+                'password' => Hash::make($request->password),
+            ]);
+        }
+
+        $roles = $request->roles ?? [];
+        $user->syncRoles($roles);
+
+        return $user;
+    }
+}

app/Http/Controllers/Admin/PermissionController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\StorePermissionRequest;
+use App\Http\Requests\Admin\UpdatePermissionRequest;
 use App\Models\Permission;
 use Illuminate\Http\Request;
 
@@ -59,19 +61,15 @@ public function create()
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Http\Requests\Admin\StorePermissionRequest  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(StorePermissionRequest $request)
     {
-        $request->validate([
-            'name' => 'required|string|max:255|unique:'.config('permission.table_names.permissions', 'permissions').',name',
-        ]);
-
         Permission::create($request->all());
 
         return redirect()->route('permission.index')
-                        ->with('message','Permission created successfully.');
+                        ->with('message', __('Permission created successfully.'));
     }
 
     /**
@@ -99,20 +97,16 @@ public function edit(Permission $permission)
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Http\Requests\Admin\UpdatePermissionRequest  $request
      * @param  \App\Models\Permission  $permission
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, Permission $permission)
+    public function update(UpdatePermissionRequest $request, Permission $permission)
     {
-        $request->validate([
-            'name' => 'required|string|max:255|unique:'.config('permission.table_names.permissions', 'permissions').',name,'.$permission->id,
-        ]);
-
         $permission->update($request->all());
 
         return redirect()->route('permission.index')
-                        ->with('message','Permission updated successfully.');
+                        ->with('message', __('Permission updated successfully.'));
     }
 
     /**
@@ -126,6 +120,6 @@ public function destroy(Permission $permission)
         $permission->delete();
 
         return redirect()->route('permission.index')
-                        ->with('message','Permission deleted successfully');
+                        ->with('message', __('Permission deleted successfully'));
     }
 }

app/Http/Controllers/Admin/RoleController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Admin;
 
 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;
@@ -61,15 +63,11 @@ public function create()
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Http\Requests\Admin\StoreRoleRequest  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(StoreRoleRequest $request)
     {
-        $request->validate([
-            'name' => 'required|string|max:255|unique:'.config('permission.table_names.roles', 'roles').',name',
-        ]);
-
         $role = Role::create($request->all());
 
         if(! empty($request->permissions)) {
@@ -110,16 +108,12 @@ public function edit(Role $role)
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Http\Requests\Admin\UpdateRoleRequest  $request
      * @param  \App\Models\Role  $role
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, Role $role)
+    public function update(UpdateRoleRequest $request, Role $role)
     {
-        $request->validate([
-            'name' => 'required|string|max:255|unique:'.config('permission.table_names.roles', 'roles').',name,'.$role->id,
-        ]);
-
         $role->update($request->all());
         $permissions = $request->permissions ?? [];
         $role->syncPermissions($permissions);
@@ -139,6 +133,6 @@ public function destroy(Role $role)
         $role->delete();
 
         return redirect()->route('role.index')
-                        ->with('message','Role deleted successfully');
+                        ->with('message', __('Role deleted successfully'));
     }
 }