From 41d59d9a803e37a374eb9fb19b6d45e22ca69908 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 30 Jul 2021 21:23:43 +0800 Subject: [PATCH 1/3] fix migration files and add admin user seeder --- .../DataTransferObjects/FullNameObject.php | 9 +--- .../Modules/Accounts/Services/UpdatesUser.php | 4 +- .../2014_10_12_000000_create_users_table.php | 6 ++- ...12_100000_create_password_resets_table.php | 9 +++- .../2021_06_23_151607_modify_users_table.php | 47 ------------------- ...26_173047_modify_password_resets_table.php | 44 ----------------- database/seeders/AdminUsersTableSeeder.php | 36 ++++++++++++++ .../seeders/CountriesTableSeeder copy.php | 40 ---------------- database/seeders/DatabaseSeeder.php | 2 +- 9 files changed, 53 insertions(+), 144 deletions(-) delete mode 100644 database/migrations/2021_06_23_151607_modify_users_table.php delete mode 100644 database/migrations/2021_06_26_173047_modify_password_resets_table.php create mode 100644 database/seeders/AdminUsersTableSeeder.php delete mode 100644 database/seeders/CountriesTableSeeder copy.php diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php index c17a8b72..ee43b57a 100644 --- a/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php +++ b/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php @@ -4,19 +4,14 @@ namespace App\Classes\Modules\Accounts\DataTransferObjects; use App\Classes\General\Interfaces\DataTransferObject; -class FullnameObject implements DataTransferObject +class FullNameObject implements DataTransferObject { /** @var string */ private $name; /** - * UserObject constructor. + * FullNameObject constructor. * @param string $name - * @param string $email - * @param string $password - * @param string $passwordConfirmation - * @param int|null $type - * @param int|null $status */ public function __construct(string $name) { diff --git a/app/Classes/Modules/Accounts/Services/UpdatesUser.php b/app/Classes/Modules/Accounts/Services/UpdatesUser.php index 5f072003..dfccbae7 100644 --- a/app/Classes/Modules/Accounts/Services/UpdatesUser.php +++ b/app/Classes/Modules/Accounts/Services/UpdatesUser.php @@ -3,7 +3,7 @@ namespace App\Classes\Modules\Accounts\Services; use App\Classes\General\Eloquent\AbstractUpdateRecord; -use App\Classes\Modules\Accounts\DataTransferObjects\FullnameObject; +use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject; use App\Models\User; class UpdatesUser extends AbstractUpdateRecord @@ -11,7 +11,7 @@ class UpdatesUser extends AbstractUpdateRecord /** * @param User $model - * @param UserObject $object + * @param FullNameObject $object * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 621a24eb..0faeb22d 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,5 +1,7 @@ id(); $table->string('name'); $table->string('email')->unique(); - $table->timestamp('email_verified_at')->nullable(); $table->string('password'); + $table->integer('type')->default(RoleTypes::USER); + $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION); $table->rememberToken(); + $table->timestamp('active_at')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php index 0ee0a36a..7d75d3c4 100644 --- a/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -14,9 +14,14 @@ class CreatePasswordResetsTable extends Migration public function up() { Schema::create('password_resets', function (Blueprint $table) { - $table->string('email')->index(); + $table->id(); + $table->foreignId('user_id')->unsigned(); $table->string('token'); - $table->timestamp('created_at')->nullable(); + $table->boolean('is_expired')->default(true); + $table->boolean('is_complete')->default(false); + $table->timestamps(); + + $table->foreign('user_id')->references('id')->on('users'); }); } diff --git a/database/migrations/2021_06_23_151607_modify_users_table.php b/database/migrations/2021_06_23_151607_modify_users_table.php deleted file mode 100644 index 6d4760e4..00000000 --- a/database/migrations/2021_06_23_151607_modify_users_table.php +++ /dev/null @@ -1,47 +0,0 @@ -dropColumn('email_verified_at'); - }); - } - - Schema::table('users', function (Blueprint $table) { - $table->integer('type')->default(RoleTypes::USER)->after('password'); - $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION)->after('type'); - $table->timestamp('active_at')->nullable()->after('remember_token'); - $table->softDeletes()->after('active_at'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function (Blueprint $table) { - $table->timestamp('email_verified_at')->nullable(); - $table->dropColumn('type'); - $table->dropColumn('status'); - $table->dropColumn('active_at'); - $table->dropSoftDeletes(); - }); - } -} diff --git a/database/migrations/2021_06_26_173047_modify_password_resets_table.php b/database/migrations/2021_06_26_173047_modify_password_resets_table.php deleted file mode 100644 index bef8cc6a..00000000 --- a/database/migrations/2021_06_26_173047_modify_password_resets_table.php +++ /dev/null @@ -1,44 +0,0 @@ -id()->first(); - $table->dropColumn('email'); - $table->foreignId('user_id')->unsigned()->after('id'); - $table->boolean('is_expired')->default(true)->after('token'); - $table->boolean('is_complete')->default(false)->after('is_expired'); - $table->timestamp('updated_at')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('password_resets', function (Blueprint $table) { - // - $table->string('email')->index()->first(); - $table->dropColumn('id'); - $table->dropColumn('user_id'); - $table->dropColumn('is_expired'); - $table->dropColumn('is_complete'); - $table->dropColumn('updated_at'); - }); - } -} diff --git a/database/seeders/AdminUsersTableSeeder.php b/database/seeders/AdminUsersTableSeeder.php new file mode 100644 index 00000000..89377e39 --- /dev/null +++ b/database/seeders/AdminUsersTableSeeder.php @@ -0,0 +1,36 @@ +insert([ + [ + 'name' => 'Shadow Admin', + 'email' => 'omair@cief-malaysia.com', + 'password' => bcrypt('123456abcabc'), + 'type' => RoleTypes::SHADOW_ADMIN, + 'status' => ApprovalStatus::APPROVED, + ], + [ + 'name' => 'Admin', + 'email' => 'admin@cief-malaysia.com', + 'password' => bcrypt('123456abcabc'), + 'type' => RoleTypes::ADMIN, + 'status' => ApprovalStatus::APPROVED, + ] + ]); + } +} diff --git a/database/seeders/CountriesTableSeeder copy.php b/database/seeders/CountriesTableSeeder copy.php deleted file mode 100644 index 7c28642d..00000000 --- a/database/seeders/CountriesTableSeeder copy.php +++ /dev/null @@ -1,40 +0,0 @@ -createsCountry = $createsCountry; - } - - - /** - * Run the database seeds. - * - * @return void - * @throws \App\Classes\Exceptions\MalformedRequestException - */ - public function run() - { - - foreach (['my', 'cn'] as $code) { - $object = new CountryObject(country($code)); - $this->createsCountry->execute($object); - } - - } -} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 03d9e01c..f0fea66f 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -13,7 +13,7 @@ class DatabaseSeeder extends Seeder */ public function run() { - // \App\Models\User::factory(10)->create(); + $this->call(AdminUsersTableSeeder::class); $this->call(CountriesTableSeeder::class); From 817c30fe191bd32e1a5c6eba0ad1d1a464def3e1 Mon Sep 17 00:00:00 2001 From: Amirul Amin Date: Mon, 2 Aug 2021 01:17:38 +0800 Subject: [PATCH 2/3] wip : data table container responsive --- resources/views/pages/dashboard.blade.php | 162 ++++++++++---------- resources/views/partials/table.blade.php | 177 ++++++++++++++++++++++ 2 files changed, 259 insertions(+), 80 deletions(-) create mode 100644 resources/views/partials/table.blade.php diff --git a/resources/views/pages/dashboard.blade.php b/resources/views/pages/dashboard.blade.php index ca3b8dc7..142ad376 100644 --- a/resources/views/pages/dashboard.blade.php +++ b/resources/views/pages/dashboard.blade.php @@ -17,8 +17,6 @@ } .sidebar { - width: 285px; - position: fixed; top: 0; bottom: 0; left: 0; @@ -119,88 +117,92 @@ -
- - -
- -