diff --git a/app/Http/Controllers/User/UserTransactionController.php b/app/Http/Controllers/User/UserTransactionController.php index 0d79750c..7e52336f 100644 --- a/app/Http/Controllers/User/UserTransactionController.php +++ b/app/Http/Controllers/User/UserTransactionController.php @@ -14,7 +14,7 @@ class UserTransactionController extends Controller */ public function indexPembeli() { - return view('user.transaction.pembeli.transaction-pembeli',[ + return view('user.transaction.pembeli.index',[ 'name'=>'npannisa', 'TransactionUser'=>TransactionUser::HistoryTransaction() ]); diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index d9783a06..7c9e70d2 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -28,7 +28,7 @@ class DatabaseSeeder extends Seeder 'nama_depan' => $faker->firstName, 'nama_belakang' => $faker->lastName, 'tanggal_lahir' => $faker->date($format = 'Y-m-d', $max = 'now'), - 'email' => fake()->unique()->safeEmail(), + 'email' => 'admin@example.net', 'email_verified_at' => now(), 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password 'remember_token' => Str::random(10), diff --git a/public/assets/css/login_register/style.css b/public/assets/css/login_register/style.css index b24970bb..5c855154 100644 --- a/public/assets/css/login_register/style.css +++ b/public/assets/css/login_register/style.css @@ -58,6 +58,13 @@ video { z-index: 3; } +.flex-input-btn { + width: 100%; + display: flex; + align-items: center; + margin-top: 3%; +} + form.sign-up-form { display: flex; align-items: start; @@ -103,8 +110,8 @@ form p { .input-field-signup-flex { width: 100%; height: 55px; + margin-top: 2%; background-color: #f0f0f0; - margin-top: 10px; border-radius: 1rem; display: grid; grid-template-columns: 15% 85%; @@ -113,6 +120,41 @@ form p { position: relative; } +.input { + width: 100%; + height: 55px; + background-color: #f0f0f0; + border-radius: 1rem; + display: grid; + grid-template-columns: 15% 85%; + display: flex; + align-items: center; + position: relative; +} +.input input { + width: 110%; + height: 100%; + background: none; + outline: none; + border: none; + border-radius: 1rem; + line-height: 1; + font-weight: 600; + margin-right: 1rem; + font-size: 0.8rem; + color: #333; +} + +.input i { + padding: 0 1.5rem; + color: #acacac; + transition: 0.5s; +} + +.up { + margin-top: 3%; +} + .input-field-signin-flex input, .input-field-signup-flex input { width: 82%; diff --git a/public/assets/js/page/modules-datatables.js b/public/assets/js/page/modules-datatables.js index e01729d5..8e263a58 100644 --- a/public/assets/js/page/modules-datatables.js +++ b/public/assets/js/page/modules-datatables.js @@ -41,9 +41,11 @@ $("[data-checkboxes]").each(function () { // User $("#table-1").dataTable({ columnDefs: [{ sortable: false, targets: [2, 7] }], + searchable: true, }); // Refund, Setting, Transaction $("#table-2").dataTable({ ordering: true, + searchable: true, }); diff --git a/resources/views/Admin/users/detail-user.blade.php b/resources/views/Admin/users/detail-user.blade.php index 3586e044..077827c1 100644 --- a/resources/views/Admin/users/detail-user.blade.php +++ b/resources/views/Admin/users/detail-user.blade.php @@ -11,7 +11,7 @@