Refactore namespace

Config/config.php

@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'name' => 'UserManager'
+    'name' => 'Usermanager'
 ];

DataTables/PermissionsDataTable.php

@@ -1,8 +1,8 @@
 <?php
 
-    namespace Modules\UserManager\DataTables;
+    namespace Modules\Usermanager\DataTables;
 
-    use Modules\UserManager\Entities\PermissionGroup;
+    use Modules\Usermanager\Entities\PermissionGroup;
 	use Yajra\DataTables\Html\Column;
 	use Yajra\DataTables\Services\DataTable;
 
@@ -41,7 +41,7 @@
         /**
          * Get query source of dataTable.
          *
-         * @param \Modules\UserManager\Entities\PermissionGroup $model
+         * @param \Modules\Usermanager\Entities\PermissionGroup $model
          *
          * @return \Illuminate\Database\Eloquent\Builder
          */

DataTables/RolesDataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\DataTables;
+    namespace Modules\Usermanager\DataTables;
 
 use Spatie\Permission\Models\Role;
 use Yajra\DataTables\Html\Column;

DataTables/UsersDataTable.php

@@ -1,8 +1,8 @@
 <?php
 
-    namespace Modules\UserManager\DataTables;
+    namespace Modules\Usermanager\DataTables;
 
-use Modules\UserManager\Entities\User;
+use Modules\Usermanager\Entities\User;
 use Yajra\DataTables\Html\Column;
 use Yajra\DataTables\Services\DataTable;
 
@@ -36,7 +36,7 @@ class UsersDataTable extends DataTable
     /**
      * Get query source of dataTable.
      *
-     * @param \Modules\UserManager\Entities\User $model
+     * @param \Modules\Usermanager\Entities\User $model
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */

Database/Migrations/2014_10_12_000000_create_users_table.php

@@ -15,8 +15,8 @@ return new class extends Migration
     {
         Schema::create('users', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor('Modules\CetakLabel\Entities\Directorat', 'directorat_id')->nullable();
-            $table->foreignIdFor('Modules\CetakLabel\Entities\SubDirectorat', 'sub_directorat_id')->nullable();
+            $table->foreignIdFor('Modules\Cetaklabel\Entities\Directorat', 'directorat_id')->nullable();
+            $table->foreignIdFor('Modules\Cetaklabel\Entities\SubDirectorat', 'sub_directorat_id')->nullable();
             $table->string('name');
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();

Database/Migrations/2023_04_15_225909_update_permissions_table.php

@@ -2,7 +2,7 @@
 
 	use Illuminate\Database\Migrations\Migration;
 	use Illuminate\Support\Facades\Schema;
-	use Modules\UserManager\Entities\PermissionGroup;
+	use Modules\Usermanager\Entities\PermissionGroup;
 
 	return new class extends Migration
 {

Database/Seeders/PermissionGroupSeeder.php

@@ -1,9 +1,9 @@
 <?php
 
-    namespace Modules\UserManager\Database\Seeders;
+    namespace Modules\Usermanager\Database\Seeders;
 
     use Illuminate\Database\Seeder;
-    use Modules\UserManager\Entities\PermissionGroup;
+    use Modules\Usermanager\Entities\PermissionGroup;
 
     class PermissionGroupSeeder extends Seeder
     {

Database/Seeders/PermissionsSeeder.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Database\Seeders;
+    namespace Modules\Usermanager\Database\Seeders;
 
     use Illuminate\Database\Seeder;
     use Spatie\Permission\Models\Permission;
@@ -15,13 +15,14 @@
          */
         public function run()
         {
-            app()[\Spatie\Permission\PermissionRegistrar::class]->forgetCachedPermissions();
+            //app()[\Spatie\Permission\PermissionRegistrar::class]->forgetCachedPermissions();
 
             $data = $this->data();
 
             foreach ($data as $value) {
                 $permission = Permission::create([
                     'name'                => $value['name'],
+                    'guard_name'          => 'web', // or 'api
                     'permission_group_id' => $value['group']
                 ]);
 

Database/Seeders/RolesSeeder.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Database\Seeders;
+    namespace Modules\Usermanager\Database\Seeders;
 
     use Illuminate\Database\Seeder;
     use Spatie\Permission\Models\Role;

Database/Seeders/UserManagerDatabaseSeeder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\UserManager\Database\Seeders;
+namespace Modules\Usermanager\Database\Seeders;
 
 use Illuminate\Database\Seeder;
 use Illuminate\Database\Eloquent\Model;

Database/Seeders/UsersSeeder.php

@@ -1,11 +1,11 @@
 <?php
 
-    namespace Modules\UserManager\Database\Seeders;
+    namespace Modules\Usermanager\Database\Seeders;
 
     use Faker\Generator;
     use Illuminate\Database\Seeder;
     use Illuminate\Support\Facades\Hash;
-    use Modules\UserManager\Entities\User;
+    use Modules\Usermanager\Entities\User;
     use Spatie\Permission\Models\Role;
 
     class UsersSeeder extends Seeder
@@ -34,7 +34,7 @@
                 'email_verified_at' => now(),
             ]);
 
-            $admin->assignRole($roleAdmin);
+            $admin->assignRole($roleAdmin,);
             $user->assignRole($roleUser);
         }
     }

Database/factories/UserFactory.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Modules\Usermanager\Database\factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\Modules\Usermanager\Entities\User>
+ */
+class UserFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition()
+    {
+        return [
+            'name' => fake()->name(),
+            'email' => fake()->unique()->safeEmail(),
+            'email_verified_at' => now(),
+            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+            'remember_token' => Str::random(10),
+        ];
+    }
+
+    /**
+     * Indicate that the model's email address should be unverified.
+     *
+     * @return static
+     */
+    public function unverified()
+    {
+        return $this->state(fn (array $attributes) => [
+            'email_verified_at' => null,
+        ]);
+    }
+}

Entities/BaseModel.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Entities;
+    namespace Modules\Usermanager\Entities;
 
     use Illuminate\Database\Eloquent\Factories\HasFactory;
     use Illuminate\Database\Eloquent\Model;

Entities/Permission.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\UserManager\Entities;
+namespace Modules\Usermanager\Entities;
 
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;

Entities/PermissionGroup.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Entities;
+    namespace Modules\Usermanager\Entities;
 
     use Illuminate\Support\Facades\DB;
     use Spatie\Permission\Models\Role;

Entities/User.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Entities;
+    namespace Modules\Usermanager\Entities;
 
     use Illuminate\Database\Eloquent\Factories\HasFactory;
     use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -14,6 +14,8 @@
         use HasApiTokens, HasFactory, Notifiable, Userstamps;
         use HasRoles;
 
+        protected $guard_name = ['web', 'api'];
+
         /**
          * The attributes that are mass assignable.
          *

Http/Controllers/Auth/AuthApiController.php

@@ -1,13 +1,13 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\ApiController;
     use Illuminate\Http\JsonResponse;
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
     use Illuminate\Support\Facades\Validator;
-    use Modules\UserManager\Entities\User;
+    use Modules\Usermanager\Entities\User;
 
     class AuthApiController extends ApiController
     {

Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -1,12 +1,12 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use App\Providers\RouteServiceProvider;
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
-    use Modules\UserManager\Http\Requests\LoginRequest;
+    use Modules\Usermanager\Http\Requests\LoginRequest;
 
     class AuthenticatedSessionController extends Controller
     {
@@ -25,7 +25,7 @@
         /**
          * Handle an incoming authentication request.
          *
-         * @param \Modules\UserManager\Http\Requests\LoginRequest $request
+         * @param \Modules\Usermanager\Http\Requests\LoginRequest $request
          *
          * @return \Illuminate\Http\RedirectResponse
          */

Http/Controllers/Auth/ConfirmablePasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use App\Providers\RouteServiceProvider;

Http/Controllers/Auth/EmailVerificationNotificationController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use App\Providers\RouteServiceProvider;

Http/Controllers/Auth/EmailVerificationPromptController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use App\Providers\RouteServiceProvider;

Http/Controllers/Auth/NewPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use Illuminate\Auth\Events\PasswordReset;

Http/Controllers/Auth/PasswordResetLinkController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use Illuminate\Http\Request;

Http/Controllers/Auth/RegisteredUserController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use App\Providers\RouteServiceProvider;
@@ -9,7 +9,7 @@
     use Illuminate\Support\Facades\Auth;
     use Illuminate\Support\Facades\Hash;
     use Illuminate\Validation\Rules;
-    use Modules\UserManager\Entities\User;
+    use Modules\Usermanager\Entities\User;
 
     class RegisteredUserController extends Controller
     {

Http/Controllers/Auth/VerifyEmailController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Auth;
+    namespace Modules\Usermanager\Http\Controllers\Auth;
 
     use App\Http\Controllers\Controller;
     use App\Providers\RouteServiceProvider;

Http/Controllers/Users/Api/RoleController.php

@@ -1,11 +1,11 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Users\Api;
+    namespace Modules\Usermanager\Http\Controllers\Users\Api;
 
     use App\Http\Controllers\ApiController;
     use Exception;
-    use Modules\UserManager\Http\Requests\Role\StoreRoleRequest;
-    use Modules\UserManager\Http\Requests\Role\UpdateRoleRequest;
+    use Modules\Usermanager\Http\Requests\Role\StoreRoleRequest;
+    use Modules\Usermanager\Http\Requests\Role\UpdateRoleRequest;
     use Spatie\Permission\Models\Role;
     use Symfony\Component\HttpFoundation\JsonResponse;
 

Http/Controllers/Users/PermissionsController.php

@@ -1,14 +1,14 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Users;
+    namespace Modules\Usermanager\Http\Controllers\Users;
 
     use App\Http\Controllers\Controller;
     use Exception;
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
-    use Modules\UserManager\DataTables\PermissionsDataTable;
-    use Modules\UserManager\Entities\Permission;
-    use Modules\UserManager\Entities\PermissionGroup;
+    use Modules\Usermanager\DataTables\PermissionsDataTable;
+    use Modules\Usermanager\Entities\Permission;
+    use Modules\Usermanager\Entities\PermissionGroup;
 
     class PermissionsController extends Controller
     {

Http/Controllers/Users/RolesController.php

@@ -1,17 +1,17 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Users;
+    namespace Modules\Usermanager\Http\Controllers\Users;
 
     use App\Http\Controllers\Controller;
     use Exception;
     use Illuminate\Http\Request;
     use Illuminate\Http\Response;
     use Illuminate\Support\Facades\Auth;
-    use Modules\UserManager\DataTables\RolesDataTable;
-    use Modules\UserManager\Entities\Permission;
-    use Modules\UserManager\Entities\PermissionGroup;
-    use Modules\UserManager\Http\Requests\Role\StoreRoleRequest;
-    use Modules\UserManager\Http\Requests\Role\UpdateRoleRequest;
+    use Modules\Usermanager\DataTables\RolesDataTable;
+    use Modules\Usermanager\Entities\Permission;
+    use Modules\Usermanager\Entities\PermissionGroup;
+    use Modules\Usermanager\Http\Requests\Role\StoreRoleRequest;
+    use Modules\Usermanager\Http\Requests\Role\UpdateRoleRequest;
     use Spatie\Permission\Models\Role;
 
     class RolesController extends Controller

Http/Controllers/Users/UsersController.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Controllers\Users;
+    namespace Modules\Usermanager\Http\Controllers\Users;
 
     use App\Http\Controllers\Controller;
     use Exception;
@@ -8,9 +8,9 @@
     use Illuminate\Http\Response;
     use Illuminate\Support\Facades\Auth;
     use Illuminate\Support\Facades\Hash;
-    use Modules\CetakLabel\Entities\Directorat;
-    use Modules\UserManager\DataTables\UsersDataTable;
-    use Modules\UserManager\Entities\User;
+    use Modules\Cetaklabel\Entities\Directorat;
+    use Modules\Usermanager\DataTables\UsersDataTable;
+    use Modules\Usermanager\Entities\User;
     use Spatie\Permission\Models\Role;
 
     class UsersController extends Controller

Http/Requests/LoginRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Requests;
+    namespace Modules\Usermanager\Http\Requests;
 
     use Illuminate\Auth\Events\Lockout;
     use Illuminate\Foundation\Http\FormRequest;

Http/Requests/Role/StoreRoleRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Requests\Role;
+    namespace Modules\Usermanager\Http\Requests\Role;
 
     use Illuminate\Foundation\Http\FormRequest;
     use Illuminate\Http\Exceptions\HttpResponseException;

Http/Requests/Role/UpdateRoleRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-    namespace Modules\UserManager\Http\Requests\Role;
+    namespace Modules\Usermanager\Http\Requests\Role;
 
     use Illuminate\Foundation\Http\FormRequest;
     use Illuminate\Http\Exceptions\HttpResponseException;

Providers/RouteServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\UserManager\Providers;
+namespace Modules\Usermanager\Providers;
 
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -12,7 +12,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $moduleNamespace = 'Modules\UserManager\Http\Controllers';
+    protected $moduleNamespace = 'Modules\Usermanager\Http\Controllers';
 
     /**
      * Called before routes are registered.
@@ -48,7 +48,7 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::middleware('web')
             ->namespace($this->moduleNamespace)
-            ->group(module_path('UserManager', '/Routes/web.php'));
+            ->group(module_path('Usermanager', '/Routes/web.php'));
     }
 
     /**
@@ -63,6 +63,6 @@ class RouteServiceProvider extends ServiceProvider
         Route::prefix('api')
             ->middleware('api')
             ->namespace($this->moduleNamespace)
-            ->group(module_path('UserManager', '/Routes/api.php'));
+            ->group(module_path('Usermanager', '/Routes/api.php'));
     }
 }

Providers/UserManagerServiceProvider.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Modules\UserManager\Providers;
+namespace Modules\Usermanager\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Database\Eloquent\Factory;
 
-class UserManagerServiceProvider extends ServiceProvider
+class UsermanagerServiceProvider extends ServiceProvider
 {
     /**
      * @var string $moduleName
      */
-    protected $moduleName = 'UserManager';
+    protected $moduleName = 'Usermanager';
 
     /**
      * @var string $moduleNameLower

Routes/api.php

@@ -1,6 +1,8 @@
 <?php
 
-    use Modules\UserManager\Http\Controllers\Users\Api\RoleController;
+    use Illuminate\Http\Request;
+    use Modules\Usermanager\Http\Controllers\Auth\AuthApiController;
+    use Modules\Usermanager\Http\Controllers\Users\Api\RoleController;
 
     /*
     |--------------------------------------------------------------------------
@@ -16,3 +18,10 @@
     Route::middleware('auth:sanctum')->group(function () {
         Route::resource('roles', RoleController::class);
     });
+
+    Route::post('register', [AuthApiController::class, 'register']);
+    Route::post('login', [AuthApiController::class, 'login']);
+
+    Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
+        return $request->user();
+    });

Routes/auth.php

@@ -1,14 +1,14 @@
 <?php
 
 	use Illuminate\Support\Facades\Route;
-	use Modules\UserManager\Http\Controllers\Auth\AuthenticatedSessionController;
-	use Modules\UserManager\Http\Controllers\Auth\ConfirmablePasswordController;
-	use Modules\UserManager\Http\Controllers\Auth\EmailVerificationNotificationController;
-	use Modules\UserManager\Http\Controllers\Auth\EmailVerificationPromptController;
-	use Modules\UserManager\Http\Controllers\Auth\NewPasswordController;
-	use Modules\UserManager\Http\Controllers\Auth\PasswordResetLinkController;
-	use Modules\UserManager\Http\Controllers\Auth\RegisteredUserController;
-	use Modules\UserManager\Http\Controllers\Auth\VerifyEmailController;
+	use Modules\Usermanager\Http\Controllers\Auth\AuthenticatedSessionController;
+	use Modules\Usermanager\Http\Controllers\Auth\ConfirmablePasswordController;
+	use Modules\Usermanager\Http\Controllers\Auth\EmailVerificationNotificationController;
+	use Modules\Usermanager\Http\Controllers\Auth\EmailVerificationPromptController;
+	use Modules\Usermanager\Http\Controllers\Auth\NewPasswordController;
+	use Modules\Usermanager\Http\Controllers\Auth\PasswordResetLinkController;
+	use Modules\Usermanager\Http\Controllers\Auth\RegisteredUserController;
+	use Modules\Usermanager\Http\Controllers\Auth\VerifyEmailController;
 
 	Route::middleware('guest')->group(function () {
     Route::get('register', [RegisteredUserController::class, 'create'])

Routes/web.php

@@ -11,9 +11,9 @@
     |
     */
 
-    use Modules\UserManager\Http\Controllers\Users\PermissionsController;
-    use Modules\UserManager\Http\Controllers\Users\RolesController;
-    use Modules\UserManager\Http\Controllers\Users\UsersController;
+    use Modules\Usermanager\Http\Controllers\Users\PermissionsController;
+    use Modules\Usermanager\Http\Controllers\Users\RolesController;
+    use Modules\Usermanager\Http\Controllers\Users\UsersController;
 
     // Users Management
     Route::group(['middleware' => ['auth', 'verified']], function () {

composer.json

@@ -18,7 +18,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Modules\\UserManager\\": ""
+            "Modules\\Usermanager\\": ""
         }
     }
 }

module.json

@@ -1,12 +1,12 @@
 {
-    "name": "UserManager",
+    "name": "Usermanager",
     "alias": "usermanager",
     "database": "",
     "description": "",
     "keywords": [],
     "priority": 99,
     "providers": [
-        "Modules\\UserManager\\Providers\\UserManagerServiceProvider"
+        "Modules\\Usermanager\\Providers\\UsermanagerServiceProvider"
     ],
     "files": []
 }