From 3d4bbd95a1460796476e6b264caa37f2257cc3c5 Mon Sep 17 00:00:00 2001 From: raditya09 Date: Sun, 29 Oct 2023 09:34:04 +0700 Subject: [PATCH 1/2] update landingpage dan admin_backend --- .../AdminBackend/ListAdminController.php | 2 +- .../admin_backend/admin_listadmin.blade.php | 10 ++++++---- resources/views/frontend/home.blade.php | 17 +++++------------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/AdminBackend/ListAdminController.php b/app/Http/Controllers/AdminBackend/ListAdminController.php index ec433a9..577d2ae 100644 --- a/app/Http/Controllers/AdminBackend/ListAdminController.php +++ b/app/Http/Controllers/AdminBackend/ListAdminController.php @@ -64,7 +64,7 @@ public function store(Request $request) $user->angkatan = $request->input('angkatan'); $user->email = $request->input('email'); $user->password = Hash::make($request->input('email')); - $user->kelas_user = '1'; + $user->kelas_user = '2'; // Setel atribut-atribut lain yang perlu diisi $user->save(); diff --git a/resources/views/admin_backend/admin_listadmin.blade.php b/resources/views/admin_backend/admin_listadmin.blade.php index 16135b0..f086c81 100644 --- a/resources/views/admin_backend/admin_listadmin.blade.php +++ b/resources/views/admin_backend/admin_listadmin.blade.php @@ -21,7 +21,7 @@
List Admin
- +
@@ -35,6 +35,7 @@ Angkatan E-Mail Role + Aksi @@ -48,6 +49,7 @@ {{ $user->angkatan }} {{ $user->email }} {{ $user->kelas_user }} + Edit Hapus @@ -69,16 +71,16 @@ title: 'Tambah Admin Baru', html: '' + - '' + + '' + ''+ '', focusConfirm: false, preConfirm: () => { const nama_lengkap = Swal.getPopup().querySelector('#nama_lengkap').value; - const nip = Swal.getPopup().querySelector('#nim').value; + const nim = Swal.getPopup().querySelector('#nim').value; const email = Swal.getPopup().querySelector('#email').value; const password = Swal.getPopup().querySelector('#password').value; - return { nama_lengkap: nama_lengkap, nim:nim, semester:semester, angkatan:angkatan, email: email, password:password }; + return { nama_lengkap: nama_lengkap, nim:nim, email: email, password:password }; } }).then((result) => { if (result.isConfirmed && result.value.nama_lengkap && result.value.nim && result.value.semester && result.value.angkatan && result.value.email && result.value.password) { diff --git a/resources/views/frontend/home.blade.php b/resources/views/frontend/home.blade.php index 814f1c3..e1b48e2 100644 --- a/resources/views/frontend/home.blade.php +++ b/resources/views/frontend/home.blade.php @@ -64,7 +64,7 @@

Fitur

-

Ratione mollitia eos ab laudantium rerum beatae quo

+

Klasifikasi Student Modelling

@@ -77,8 +77,8 @@
-

Corporis voluptates sit

-

Consequuntur sunt aut quasi enim aliquam quae harum pariatur laboris nisi ut aliquip

+

Tampilan yang Simpel

+

Tampilan yang sederhana memudahkan pengguna dalam mengoperasikan aplikasi ini

@@ -171,7 +171,7 @@

Web 3

Web

- +
@@ -289,7 +289,7 @@

Tim

-

Anggota Tim Pengembangan Sistem

+

Pengembangan Sistem

@@ -308,7 +308,6 @@

Intan Sulistyaningrum Sakkinah, S.Pd., M.Eng.

Ketua Peneliti -

Velit aut quia fugit et et. Dolorum ea voluptate vel tempore tenetur ipsa quae aut. Ipsum exercitationem iure minima enim corporis et voluptate.

@@ -327,7 +326,6 @@

Raditya Arief Pratama, S.Kom., M.Eng.

Anggota Peneliti -

Quo esse repellendus quia id. Est eum et accusantium pariatur fugit nihil minima suscipit corporis. Voluptate sed quas reiciendis animi neque sapiente.

@@ -346,7 +344,6 @@

Qonitatul Hasanah, S.T., M.Tr.T.

Anggota Peneliti -

Vero omnis enim consequatur. Voluptas consectetur unde qui molestiae deserunt. Voluptates enim aut architecto porro aspernatur molestiae modi.

@@ -364,7 +361,6 @@

Ahmad Firdaus Tarmidzi

Mahasiswa -

Velit aut quia fugit et et. Dolorum ea voluptate vel tempore tenetur ipsa quae aut. Ipsum exercitationem iure minima enim corporis et voluptate.

@@ -384,7 +380,6 @@

Dimas Pratama

Mahasiswa -

Velit aut quia fugit et et. Dolorum ea voluptate vel tempore tenetur ipsa quae aut. Ipsum exercitationem iure minima enim corporis et voluptate.

@@ -403,7 +398,6 @@

Amalia Fitria Dewi

Mahasiswa -

Quo esse repellendus quia id. Est eum et accusantium pariatur fugit nihil minima suscipit corporis. Voluptate sed quas reiciendis animi neque sapiente.

@@ -422,7 +416,6 @@

Ahmad Fikril Al Muzakki

Mahasiswa -

Vero omnis enim consequatur. Voluptas consectetur unde qui molestiae deserunt. Voluptates enim aut architecto porro aspernatur molestiae modi.

From fb46c2503d26b051fa4675962dce1fc9e2e356ad Mon Sep 17 00:00:00 2001 From: raditya09 Date: Mon, 30 Oct 2023 11:20:48 +0700 Subject: [PATCH 2/2] Update admin side --- .../AdminBackend/AdminDashboardController.php | 3 +- .../AdminBackend/ListAdminController.php | 96 +++++++++---------- .../admin_backend/admin_listadmin.blade.php | 26 +++-- .../admin_backend/admin_listuser.blade.php | 15 ++- .../admin_backend/layouts/sidebar.blade.php | 22 ++++- 5 files changed, 93 insertions(+), 69 deletions(-) diff --git a/app/Http/Controllers/AdminBackend/AdminDashboardController.php b/app/Http/Controllers/AdminBackend/AdminDashboardController.php index 2062bc9..99406cc 100644 --- a/app/Http/Controllers/AdminBackend/AdminDashboardController.php +++ b/app/Http/Controllers/AdminBackend/AdminDashboardController.php @@ -13,7 +13,8 @@ class AdminDashboardController extends Controller // public function index() { - $angkatanCounts = User::select('angkatan', DB::raw('count(*) as total')) + $angkatanCounts = User::whereNotNull('angkatan') + ->select('angkatan', DB::raw('count(*) as total')) ->groupBy('angkatan') ->orderBy('angkatan', 'desc') ->get(); diff --git a/app/Http/Controllers/AdminBackend/ListAdminController.php b/app/Http/Controllers/AdminBackend/ListAdminController.php index 577d2ae..dfa885b 100644 --- a/app/Http/Controllers/AdminBackend/ListAdminController.php +++ b/app/Http/Controllers/AdminBackend/ListAdminController.php @@ -18,56 +18,52 @@ public function index() $users = User::all()->whereIn('kelas_user', ['1','2']); return view('admin_backend.admin_listadmin', compact('users')); } - // /** - // * Get a validator for an incoming registration request. - // * - // * @param array $data - // * @return \Illuminate\Contracts\Validation\Validator - // */ - // protected function validator(array $data) - // { - // return Validator::make($data, [ - // 'nama_lengkap' => ['required', 'string', 'max:255'], - // 'nim' => ['required', 'string', 'max:20'], - // 'semester' => ['required', 'integer', 'max:12'], - // 'angkatan' => ['required', 'integer', 'max:2250'], - // 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], - // 'password' => ['required', 'string', 'min:8', 'confirmed'], - // ]); - // } + /** + * Get a validator for an incoming registration request. + * + * @param array $data + * @return \Illuminate\Contracts\Validation\Validator + */ + protected function validator(array $data) + { + return Validator::make($data, [ + 'nama_lengkap' => ['required', 'string', 'max:255'], + 'nim' => ['required', 'string', 'max:20'], + 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], + 'password' => ['required', 'string', 'min:8', 'confirmed'], + ]); + } + + /** + * Create a new user instance after a valid registration. + * + * @param array $data + * @return \App\Models\User + */ + protected function create(array $data) + { + return User::create([ + 'nama_lengkap' => $data['nama_lengkap'], + 'nim' => $data['nim'], + 'email' => $data['email'], + 'password' => Hash::make($data['password']), + 'kelas_user' => '2', + ]); + } - // /** - // * Create a new user instance after a valid registration. - // * - // * @param array $data - // * @return \App\Models\User - // */ - // protected function create(array $data) - // { - // return User::create([ - // 'nama_lengkap' => $data['nama_lengkap'], - // 'nim' => $data['nim'], - // 'semester' => $data['semester'], - // 'angkatan' => $data['angkatan'], - // 'email' => $data['email'], - // 'password' => Hash::make($data['password']), - // 'kelas_user' => '1', - // ]); - // } + // public function store(Request $request) + // { + // $user = new User(); + // $user->nama_lengkap = $request->input('nama_lengkap'); + // $user->nim = $request->input('nim'); + // $user->semester = $request->input('semester'); + // $user->angkatan = $request->input('angkatan'); + // $user->email = $request->input('email'); + // $user->password = Hash::make($request->input('email')); + // $user->kelas_user = '2'; + // // Setel atribut-atribut lain yang perlu diisi + // $user->save(); - public function store(Request $request) - { - $user = new User(); - $user->nama_lengkap = $request->input('nama_lengkap'); - $user->nim = $request->input('nim'); - $user->semester = $request->input('semester'); - $user->angkatan = $request->input('angkatan'); - $user->email = $request->input('email'); - $user->password = Hash::make($request->input('email')); - $user->kelas_user = '2'; - // Setel atribut-atribut lain yang perlu diisi - $user->save(); - - return response()->json(['message' => 'User ditambahkan'], 201); - } + // return response()->json(['message' => 'User ditambahkan'], 201); + // } } diff --git a/resources/views/admin_backend/admin_listadmin.blade.php b/resources/views/admin_backend/admin_listadmin.blade.php index 4a567b1..3118882 100644 --- a/resources/views/admin_backend/admin_listadmin.blade.php +++ b/resources/views/admin_backend/admin_listadmin.blade.php @@ -28,28 +28,34 @@ - + - - - + + - + @foreach($users as $user) - - - - + + @@ -83,7 +89,7 @@ return { nama_lengkap: nama_lengkap, nim:nim, email: email, password:password }; } }).then((result) => { - if (result.isConfirmed && result.value.nama_lengkap && result.value.nim && result.value.semester && result.value.angkatan && result.value.email && result.value.password) { + if (result.isConfirmed && result.value.nama_lengkap && result.value.nim && result.value.email && result.value.password) { // Kirim data user ke server menggunakan AJAX atau formulir biasa // Contoh: Anda dapat menggunakan Axios untuk AJAX axios.post('/listadmin', { diff --git a/resources/views/admin_backend/admin_listuser.blade.php b/resources/views/admin_backend/admin_listuser.blade.php index 161c363..07f9f10 100644 --- a/resources/views/admin_backend/admin_listuser.blade.php +++ b/resources/views/admin_backend/admin_listuser.blade.php @@ -26,7 +26,7 @@
idNo Nama LengkapNIMSemesterAngkatanNIP E-Mail Role Aksi
{{ $user->nama_lengkap }} {{ $user->nim }}{{ $user->semester }}{{ $user->angkatan }} {{ $user->email }}{{ $user->kelas_user }}Edit Hapus kelas_user == 1) { + echo "Super Admin"; + } else { + echo "Admin"; + } ?> + + Edit + Hapus +
- + @@ -36,17 +36,22 @@ - @foreach($users as $user) + + @foreach($users as $user) - + - + - + + @endforeach
idNo Nama Lengkap NIM Semester
{{ $user->id}} {{ $user->nama_lengkap }}{{ $user->nim }}{{ $user->nim }} {{ $user->semester }} {{ $user->angkatan }} {{ $user->email }}{{ $user->kelas_user }}kelas_user == 3) { + echo "Mahasiswa"; + } ?> +
diff --git a/resources/views/admin_backend/layouts/sidebar.blade.php b/resources/views/admin_backend/layouts/sidebar.blade.php index 2f8a41b..ca6d51c 100644 --- a/resources/views/admin_backend/layouts/sidebar.blade.php +++ b/resources/views/admin_backend/layouts/sidebar.blade.php @@ -2,8 +2,16 @@