From 842f4a2386bdc2c22121a403fb381bd858509072 Mon Sep 17 00:00:00 2001 From: hayatie Date: Sun, 21 Apr 2024 12:30:02 +0800 Subject: [PATCH] update-admin-ui --- .../API/v1/Nominee/DeleteController.php | 2 +- .../assets/js/components/demo/admin/admin/edit.vue | 2 +- .../assets/js/components/demo/admin/index.vue | 12 ++++++------ .../js/components/demo/admin/nominee/edit.vue | 6 +++--- .../js/components/demo/admin/nominee/index.vue | 14 +++++++++++--- .../js/components/demo/admin/voter/index.vue | 6 +++--- .../assets/js/components/demo/voter/home/zoom.vue | 4 ++-- .../assets/js/components/demo/voter/login.vue | 2 +- 8 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/API/v1/Nominee/DeleteController.php b/app/Http/Controllers/API/v1/Nominee/DeleteController.php index f7ea518..54a51e1 100644 --- a/app/Http/Controllers/API/v1/Nominee/DeleteController.php +++ b/app/Http/Controllers/API/v1/Nominee/DeleteController.php @@ -11,7 +11,7 @@ class DeleteController extends Controller { public function __invoke ($id) { - $nominee = Nominee::find($id); + $nominee = Nominee::findOrFail($id); Util::deleteImage($nominee->image); $nominee->delete(); diff --git a/resources/assets/js/components/demo/admin/admin/edit.vue b/resources/assets/js/components/demo/admin/admin/edit.vue index 788efff..cc560af 100644 --- a/resources/assets/js/components/demo/admin/admin/edit.vue +++ b/resources/assets/js/components/demo/admin/admin/edit.vue @@ -56,7 +56,7 @@ export default{ .catch(error=>{ $.notifyClose(); vm.loading = false; - vm.util.showResult(error, 'error') + vm.util.showResult(error.response, 'error'); }) } } diff --git a/resources/assets/js/components/demo/admin/index.vue b/resources/assets/js/components/demo/admin/index.vue index 0705ea2..219bab8 100644 --- a/resources/assets/js/components/demo/admin/index.vue +++ b/resources/assets/js/components/demo/admin/index.vue @@ -16,9 +16,9 @@ @@ -85,7 +85,7 @@ export default{ // }), created: function () { - this.util.setTitle('Voting System - Administrator'); + this.util.setTitle('MyKoPKB - Administrator'); var vm = this; if (this.util.isLogin()) { this.util.setAuthorization(); diff --git a/resources/assets/js/components/demo/admin/nominee/edit.vue b/resources/assets/js/components/demo/admin/nominee/edit.vue index 4e9487f..6b87657 100644 --- a/resources/assets/js/components/demo/admin/nominee/edit.vue +++ b/resources/assets/js/components/demo/admin/nominee/edit.vue @@ -62,7 +62,7 @@
- + @@ -125,7 +125,7 @@ export default{ if (this.loading) return; var vm = this; this.loading = true; - this.util.notify('Updating nominee', 'progress', 0); + this.util.notify('Kemaskini undian', 'progress', 0); $('#edit_form').ajaxSubmit({ success: function (response) { $.notifyClose(); @@ -139,7 +139,7 @@ export default{ vm.util.showResult(error, 'error', 'ajax'); }, uploadProgress: function (a, b, c, progress) { - this.util.notify('Updating nominee', 'progress', progress); + this.util.notify('Kemaskini undian', 'progress', progress); } }) } diff --git a/resources/assets/js/components/demo/admin/nominee/index.vue b/resources/assets/js/components/demo/admin/nominee/index.vue index 03e9c1b..4665134 100644 --- a/resources/assets/js/components/demo/admin/nominee/index.vue +++ b/resources/assets/js/components/demo/admin/nominee/index.vue @@ -51,7 +51,7 @@ - Edit + Set semula + @@ -105,8 +105,16 @@ export default { axios.delete(config.API + 'nominee/' + nomineeId) // Make DELETE request .then(response => { $.notifyClose(); // Close notification - if (this.util.showResult(response, 'success')) { // Show success notification + // if (this.util.showResult(response, 'success')) { + if (response.data && response.data.status === 'success') { + this.util.notify('Nominee deleted successfully', 'success'); + + + // Show success notification this.refreshNominee(); // Refresh the list of nominees + } else { + this.util.notify('Failed to delete nominee', 'error'); // Show error notification + } }) .catch(error => { diff --git a/resources/assets/js/components/demo/admin/voter/index.vue b/resources/assets/js/components/demo/admin/voter/index.vue index e76a762..743097c 100644 --- a/resources/assets/js/components/demo/admin/voter/index.vue +++ b/resources/assets/js/components/demo/admin/voter/index.vue @@ -22,7 +22,7 @@ Unit Saham Yuran - Action + Tindakan @@ -35,12 +35,12 @@ {{ voter.yuran }} diff --git a/resources/assets/js/components/demo/voter/home/zoom.vue b/resources/assets/js/components/demo/voter/home/zoom.vue index b9b267d..59efc4c 100644 --- a/resources/assets/js/components/demo/voter/home/zoom.vue +++ b/resources/assets/js/components/demo/voter/home/zoom.vue @@ -77,8 +77,8 @@ export default { .centered-image { /* Styles for the image */ - max-width: 30%; /* Ensure the image does not exceed container width */ - max-height: 30%; /* Ensure the image does not exceed container height */ + max-width: 20%; /* Ensure the image does not exceed container width */ + max-height: 20%; /* Ensure the image does not exceed container height */ position: relative; /* top: 50%; */ left: 50%; diff --git a/resources/assets/js/components/demo/voter/login.vue b/resources/assets/js/components/demo/voter/login.vue index 3375369..2a26231 100644 --- a/resources/assets/js/components/demo/voter/login.vue +++ b/resources/assets/js/components/demo/voter/login.vue @@ -37,7 +37,7 @@ document.addEventListener('DOMContentLoaded', function () { // Select the image element by its ID var logoImage = document.getElementById('logo'); // Set the source of the image dynamically -logoImage.src = 'https://i.ibb.co/txhx2N0/My-Ko-PKB-logo-removebg-preview.png'; // Replace this URL with your desired image URL +logoImage.src = 'https://i.ibb.co/txhx2N0/My-Ko-PKB-logo-removebg-preview.png?' + new Date().getTime(); // Replace this URL with your desired image URL // Add error handling logoImage.onerror = function() {