diff --git a/composer.json b/composer.json index baae47a..f2396ba 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "nwidart/laravel-modules": "^10.0", "putrakuningan/cetaklabel-module": "dev-master", "putrakuningan/logs-module": "^1.0", + "putrakuningan/usermanager-module": "dev-master", "spatie/laravel-activitylog": "^4.7", "spatie/laravel-permission": "^5.10", "wildside/userstamps": "^2.3", @@ -92,12 +93,12 @@ { "name": "putrakuningan/cetaklabel-module", "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/CetakLabel" + "url": "https://git.putrakuningan.com/putrakuningan/Cetaklabel" }, { "name": "putrakuningan/usermanager-module", "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/UserManager" + "url": "https://git.putrakuningan.com/putrakuningan/Usermanager" } ] } diff --git a/composer.lock b/composer.lock index eccdb1e..c7636ad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3331fe53e7be9dc11ac871275b11223c", + "content-hash": "a6fddd68e867d09af781a2e63070d709", "packages": [ { "name": "anlutro/l4-settings", @@ -4031,7 +4031,7 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://git.putrakuningan.com/putrakuningan/CetakLabel", + "url": "https://git.putrakuningan.com/putrakuningan/Cetaklabel", "reference": "5db56258b31950f162a4ab1b5769932e3d258818" }, "default-branch": true, @@ -4044,7 +4044,7 @@ }, "autoload": { "psr-4": { - "Modules\\CetakLabel\\": "" + "Modules\\Cetaklabel\\": "" } }, "authors": [ @@ -4072,7 +4072,7 @@ }, "autoload": { "psr-4": { - "Modules\\CetakLabel\\": "" + "Modules\\Cetaklabel\\": "" } }, "authors": [ @@ -4083,6 +4083,35 @@ ], "time": "2023-05-15T17:16:12+00:00" }, + { + "name": "putrakuningan/usermanager-module", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://git.putrakuningan.com/putrakuningan/Usermanager", + "reference": "55ba120a1dba6a05844aae9b0eceda61b8f53db3" + }, + "default-branch": true, + "type": "laravel-module", + "extra": { + "laravel": { + "providers": [], + "aliases": [] + } + }, + "autoload": { + "psr-4": { + "Modules\\Usermanager\\": "" + } + }, + "authors": [ + { + "name": "Daeng Deni Mardaeni", + "email": "ddeni05@gmail.com" + } + ], + "time": "2023-05-16T09:57:59+00:00" + }, { "name": "ralouphie/getallheaders", "version": "3.0.3", diff --git a/config/auth.php b/config/auth.php index 426ab95..e114b36 100644 --- a/config/auth.php +++ b/config/auth.php @@ -62,7 +62,7 @@ return [ 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => \Modules\UserManager\Entities\User::class, + 'model' => \Modules\Usermanager\Entities\User::class, ], // 'users' => [ diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php deleted file mode 100644 index b52b528..0000000 --- a/database/factories/UserFactory.php +++ /dev/null @@ -1,40 +0,0 @@ - - */ -class UserFactory extends Factory -{ - /** - * Define the model's default state. - * - * @return array - */ - 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, - ]); - } -} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index ac676c4..dbd9203 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -4,7 +4,7 @@ // use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; - use Modules\UserManager\Database\Seeders\UsersSeeder; + use Modules\Usermanager\Database\Seeders\UsersSeeder; class DatabaseSeeder extends Seeder { diff --git a/modules_statuses.json b/modules_statuses.json index be476f9..9a6f1db 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -1,5 +1,5 @@ { - "CetakLabel": true, + "Cetaklabel": true, "Logs": true, - "UserManager": true + "Usermanager": true } diff --git a/routes/api.php b/routes/api.php index 06b05d2..cc24eae 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,10 +1,5 @@ get('/user', function (Request $request) { - return $request->user(); -}); diff --git a/routes/web.php b/routes/web.php index 152488f..884164e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,9 +11,9 @@ use App\Http\Controllers\SubJobController; use App\Http\Controllers\SubSubJobController; use Illuminate\Support\Facades\Route; - 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; /* |-------------------------------------------------------------------------- diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php index e2c0197..8c676aa 100644 --- a/tests/Feature/Auth/AuthenticationTest.php +++ b/tests/Feature/Auth/AuthenticationTest.php @@ -4,7 +4,7 @@ namespace Tests\Feature\Auth; use App\Providers\RouteServiceProvider; use Illuminate\Foundation\Testing\RefreshDatabase; -use Modules\UserManager\Entities\User; +use Modules\Usermanager\Entities\User; use Tests\TestCase; class AuthenticationTest extends TestCase diff --git a/tests/Feature/Auth/EmailVerificationTest.php b/tests/Feature/Auth/EmailVerificationTest.php index f66bf3a..59795fc 100644 --- a/tests/Feature/Auth/EmailVerificationTest.php +++ b/tests/Feature/Auth/EmailVerificationTest.php @@ -7,7 +7,7 @@ use Illuminate\Auth\Events\Verified; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\URL; -use Modules\UserManager\Entities\User; +use Modules\Usermanager\Entities\User; use Tests\TestCase; class EmailVerificationTest extends TestCase diff --git a/tests/Feature/Auth/PasswordConfirmationTest.php b/tests/Feature/Auth/PasswordConfirmationTest.php index f29b0a1..96e76d8 100644 --- a/tests/Feature/Auth/PasswordConfirmationTest.php +++ b/tests/Feature/Auth/PasswordConfirmationTest.php @@ -3,7 +3,7 @@ namespace Tests\Feature\Auth; use Illuminate\Foundation\Testing\RefreshDatabase; -use Modules\UserManager\Entities\User; +use Modules\Usermanager\Entities\User; use Tests\TestCase; class PasswordConfirmationTest extends TestCase diff --git a/tests/Feature/Auth/PasswordResetTest.php b/tests/Feature/Auth/PasswordResetTest.php index cc6e189..6bbf89f 100644 --- a/tests/Feature/Auth/PasswordResetTest.php +++ b/tests/Feature/Auth/PasswordResetTest.php @@ -5,7 +5,7 @@ namespace Tests\Feature\Auth; use Illuminate\Auth\Notifications\ResetPassword; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Notification; -use Modules\UserManager\Entities\User; +use Modules\Usermanager\Entities\User; use Tests\TestCase; class PasswordResetTest extends TestCase