Merge pull request #1 from hafijul233/develop

Develop

Author: hafijul233

Database/Factories/Rbac/UserFactory.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\Admin\Database\Factories\Rbac;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+use Modules\Admin\Models\User;
+
+class UserFactory extends Factory
+{
+
+    /**
+     * @var User $model
+     */
+    protected $model = User::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->name(),
+            'email' => $this->faker->unique()->safeEmail(),
+            'username' => $this->faker->unique()->userName(),
+            'mobile' => str_replace('+', '',$this->faker->unique()->e164PhoneNumber()),
+            'force_pass_reset' => false,
+            'remarks' => $this->faker->paragraph(2),
+            'enabled' => 'yes',
+            'email_verified_at' => now(),
+            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+            'remember_token' => Str::random(10),
+        ];
+    }
+
+}

Database/Migrations/2014_10_12_000000_create_users_table.php

@@ -0,0 +1,50 @@
+<?php
+
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Modules\Admin\Supports\Constant;
+use Modules\Admin\Supports\DefaultValue;
+
+class CreateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('email')->nullable()->unique();
+            $table->string('username')->nullable()->unique();
+            $table->string('mobile')->nullable()->unique();
+            $table->string('password');
+            $table->boolean('force_pass_reset')->default(false);
+            $table->string('remarks')->nullable();
+            $table->enum('enabled', array_keys(Constant::ENABLED_OPTIONS))
+                ->default(DefaultValue::ENABLED_OPTION)->nullable();
+            $table->rememberToken();
+            $table->foreignId('created_by')->index()->nullable();
+            $table->foreignId('updated_by')->index()->nullable();
+            $table->foreignId('deleted_by')->index()->nullable();
+            $table->dateTime('email_verified_at')->nullable();
+            $table->dateTime('created_at')->nullable();
+            $table->dateTime('updated_at')->nullable();
+            $table->dateTime('deleted_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users');
+    }
+}

Database/Migrations/2021_08_06_071712_create_permission_tables.php

@@ -3,8 +3,8 @@
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
-use Modules\Core\Supports\Constant;
-use Modules\Core\Supports\DefaultValue;
+use Modules\Admin\Supports\Constant;
+use Modules\Admin\Supports\DefaultValue;
 
 class CreatePermissionTables extends Migration
 {

Database/Migrations/2021_11_05_094427_create_media_table.php

@@ -0,0 +1,39 @@
+<?php
+
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+
+class CreateMediaTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('media', function (Blueprint $table) {
+            $table->id();
+            $table->morphs('model');
+            $table->uuid('uuid')->nullable();
+            $table->string('collection_name');
+            $table->string('name');
+            $table->string('file_name');
+            $table->string('mime_type')->nullable();
+            $table->string('disk');
+            $table->string('conversions_disk')->nullable();
+            $table->unsignedBigInteger('size');
+            $table->json('manipulations');
+            $table->json('custom_properties');
+            $table->json('generated_conversions');
+            $table->json('responsive_images');
+            $table->unsignedInteger('order_column')->nullable();
+
+            $table->dateTime('created_at')->nullable();
+            $table->dateTime('updated_at')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('media');
+    }
+}

Database/Migrations/2021_11_06_184251_create_audits_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAuditsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('audits', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('user_type')->nullable();
+            $table->unsignedBigInteger('user_id')->nullable();
+            $table->string('event');
+            $table->morphs('auditable');
+            $table->text('old_values')->nullable();
+            $table->text('new_values')->nullable();
+            $table->text('url')->nullable();
+            $table->ipAddress('ip_address')->nullable();
+            $table->string('user_agent', 1023)->nullable();
+            $table->string('tags')->nullable();
+            $table->timestamps();
+
+            $table->index(['user_id', 'user_type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('audits');
+    }
+}

Database/Seeders/AdminDatabaseSeeder.php

@@ -2,8 +2,12 @@
 
 namespace Modules\Admin\Database\Seeders;
 
-use Illuminate\Database\Seeder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Seeder;
+use Modules\Admin\Database\Seeders\Rbac\PermissionSeeder;
+use Modules\Admin\Database\Seeders\Rbac\RolePermissionSeeder;
+use Modules\Admin\Database\Seeders\Rbac\RoleSeeder;
+use Modules\Admin\Database\Seeders\Rbac\UserSeeder;
 
 class AdminDatabaseSeeder extends Seeder
 {
@@ -18,6 +22,8 @@ public function run()
 
         $this->call(PermissionSeeder::class);
         $this->call(RoleSeeder::class);
+        $this->call(UserSeeder::class);
         $this->call(RolePermissionSeeder::class);
+        $this->call(UserRegisterSeeder::class);
     }
 }

Database/Seeders/PermissionSeeder.php …tabase/Seeders/Rbac/PermissionSeeder.phpDatabase/Seeders/PermissionSeeder.php renamed to Database/Seeders/Rbac/PermissionSeeder.php Database/Seeders/PermissionSeeder.php renamed to Database/Seeders/Rbac/PermissionSeeder.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Modules\Admin\Database\Seeders;
+namespace Modules\Admin\Database\Seeders\Rbac;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Route;
 use Modules\Admin\Models\Rbac\Permission;
-use Modules\Core\Supports\Helper;
+use Modules\Admin\Supports\Helper;
 
 class PermissionSeeder extends Seeder
 {

Database/Seeders/RolePermissionSeeder.php …se/Seeders/Rbac/RolePermissionSeeder.phpDatabase/Seeders/RolePermissionSeeder.php renamed to Database/Seeders/Rbac/RolePermissionSeeder.php Database/Seeders/RolePermissionSeeder.php renamed to Database/Seeders/Rbac/RolePermissionSeeder.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Modules\Admin\Database\Seeders;
+namespace Modules\Admin\Database\Seeders\Rbac;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
-use Modules\Admin\Models\Authorization\Permission;
-use Modules\Admin\Models\Authorization\Role;
+use Modules\Admin\Models\Rbac\Permission;
+use Modules\Admin\Models\Rbac\Role;
 
 class RolePermissionSeeder extends Seeder
 {

Database/Seeders/RoleSeeder.php Database/Seeders/Rbac/RoleSeeder.phpDatabase/Seeders/RoleSeeder.php renamed to Database/Seeders/Rbac/RoleSeeder.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Modules\Admin\Database\Seeders;
+namespace Modules\Admin\Database\Seeders\Rbac;
 
 use Illuminate\Database\Seeder;
 use Illuminate\Database\Eloquent\Model;
 use Modules\Admin\Models\Rbac\Role;
+use Modules\Admin\Supports\DefaultValue;
 
 class RoleSeeder extends Seeder
 {
@@ -21,13 +22,13 @@ public function run()
         Role::unsetEventDispatcher();
         Role::create([
             'id' => 1,
-            'name' => 'Super Administration',
+            'name' => DefaultValue::SUPER_ADMIN_ROLE,
             'remarks' => 'Role which will have all privileges.'
         ]);
 
         Role::create([
             'id' => 2,
-            'name' => 'Administration',
+            'name' => 'Administrator',
             'remarks' => 'Role which will have all privileges.'
         ]);
 

Database/Seeders/Rbac/UserSeeder.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Admin\Database\Seeders\Rbac;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+use Modules\Admin\Models\User;
+
+class UserSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     * @throws \Exception|\Throwable
+     */
+    public function run()
+    {
+        Model::unguard();
+        //disable Observer
+        $eventDispatcher = User::getEventDispatcher();
+        User::unsetEventDispatcher();
+
+        User::factory(10)->create();
+        //Enable observer
+        User::setEventDispatcher($eventDispatcher);
+
+    }
+}