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 @@
-
+
diff --git a/resources/views/Admin/users/index.blade.php b/resources/views/Admin/users/index.blade.php index 433a28cb..94a005e9 100644 --- a/resources/views/Admin/users/index.blade.php +++ b/resources/views/Admin/users/index.blade.php @@ -21,7 +21,6 @@ Foto Profil Nama Panjang Email - {{-- Gender --}} Tanggal Daftar Status Aksi @@ -37,7 +36,7 @@ ... - {{ $user->nama }} + {{ $user->nama_depan.' '.$user->nama_belakang }} {{ $user->email }} {{ $user->created_at }} diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 9dcb8125..1ddf6676 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -87,7 +87,7 @@
--}} -
+
-
- - +
+
+ + +
+ +
+
+ +
-
$(document).ready(function() { + let verificationStatus = false; + let verificationCode = ''; + + function generateVerificationCode() { + const codeLength = 6; + let code = ''; + for (let i = 0; i < codeLength; i++) { + code += Math.floor(Math.random() * 10); // Menghasilkan digit acak dari 0 hingga 9 + } + return code; + } + $('#cekAkun').on('click', function() { let email = document.querySelector('[name="email"]').value; const csrfToken = $('meta[name="csrf-token"]').attr('content'); @@ -470,6 +492,27 @@ } }); + $('#verifikasiEmail').on('click', function() { + + }); + + $('#newEmail').on('input', function() { + const newEmail = $(this); + clearTimeout(newEmail.timer); // Menghapus timeout yang ada + + // Menunggu 5 detik sebelum menghasilkan kode verifikasi + newEmail.timer = setTimeout(function() { + const email = newEmail.val().trim(); // Menghapus spasi di awal dan akhir + + if (email === '') { + alert('Silakan masukkan alamat email Anda terlebih dahulu.'); + } else { + const verificationCode = generateVerificationCode(); + console.log(verificationCode); + } + }, 5000); + }); + $('#signUp').on('click', function() { let emptyInput = []; const csrfToken = $('meta[name="csrf-token"]').attr('content'); @@ -479,6 +522,7 @@ let email = document.querySelector('[name="new_email"]').value; let nohp = document.querySelector('[name="nohp"]').value; let gender = document.querySelector('[name="gender"]').value; + let emailVerification = document.querySelector('[name="email-verification"]').value; // Tanggal lahir let tanggalLahir = document.querySelector('[name="tanggal_lahir"]').value; @@ -514,6 +558,8 @@ if (email.trim() === "") { emptyInput.push("Email tidak boleh kosong"); + } else if (!verificationStatus) { + emptyInput.push("Verifikasi email terlebih dahulu"); } if (nohp.trim() === "") {