diff --git a/package-lock.json b/package-lock.json index 480c8b0..0842c78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "postcss": "^8", "vue": "^3.2.13", "vue-router": "^4.0.14", + "vue-sweetalert2": "^5.0.5", "vuex": "^4.0.2" }, "devDependencies": { @@ -9068,6 +9069,15 @@ "node": ">= 10" } }, + "node_modules/sweetalert2": { + "version": "11.4.29", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.29.tgz", + "integrity": "sha512-UMCZgyEk0m+KizxspB8Bsm5ZQRdguba2t2+Rf0r8XBmq5YqhXq7ItV2C15A3VLfRlxHnEJBTYg6hkSk/x+5Ofw==", + "funding": { + "type": "individual", + "url": "https://sweetalert2.github.io/#donations" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -9588,6 +9598,17 @@ "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", "dev": true }, + "node_modules/vue-sweetalert2": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/vue-sweetalert2/-/vue-sweetalert2-5.0.5.tgz", + "integrity": "sha512-Q7+TjQxNwGruT2jfPaSKMz18HHWs81r4umEwlrrtOf/QL5Iwl1T+tUaNkcvKB7Rf9rYftubt7NnOMjfDMnDH3A==", + "dependencies": { + "sweetalert2": "11.x" + }, + "peerDependencies": { + "vue": "*" + } + }, "node_modules/vue-template-es2015-compiler": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", @@ -16971,6 +16992,11 @@ } } }, + "sweetalert2": { + "version": "11.4.29", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.29.tgz", + "integrity": "sha512-UMCZgyEk0m+KizxspB8Bsm5ZQRdguba2t2+Rf0r8XBmq5YqhXq7ItV2C15A3VLfRlxHnEJBTYg6hkSk/x+5Ofw==" + }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -17357,6 +17383,14 @@ } } }, + "vue-sweetalert2": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/vue-sweetalert2/-/vue-sweetalert2-5.0.5.tgz", + "integrity": "sha512-Q7+TjQxNwGruT2jfPaSKMz18HHWs81r4umEwlrrtOf/QL5Iwl1T+tUaNkcvKB7Rf9rYftubt7NnOMjfDMnDH3A==", + "requires": { + "sweetalert2": "11.x" + } + }, "vue-template-es2015-compiler": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", diff --git a/package.json b/package.json index e4c7d03..a6b0cac 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "postcss": "^8", "vue": "^3.2.13", "vue-router": "^4.0.14", + "vue-sweetalert2": "^5.0.5", "vuex": "^4.0.2" }, "devDependencies": { diff --git a/public/img/arrahn_favicon.ico b/public/img/arrahn_favicon.ico new file mode 100644 index 0000000..3a6071c Binary files /dev/null and b/public/img/arrahn_favicon.ico differ diff --git a/public/img/logo_arrahn.png b/public/img/logo_arrahn.png new file mode 100644 index 0000000..30dfab5 Binary files /dev/null and b/public/img/logo_arrahn.png differ diff --git a/public/img/logo_pkb.png b/public/img/logo_pkb.png new file mode 100644 index 0000000..a1805a4 Binary files /dev/null and b/public/img/logo_pkb.png differ diff --git a/public/index.html b/public/index.html index 911ca60..cc8b42d 100644 --- a/public/index.html +++ b/public/index.html @@ -5,12 +5,13 @@ - + + - Lelong | Ar-Rahn + eLelong | Ar-Rahn diff --git a/src/App.vue b/src/App.vue index 1200439..c108b0b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,20 +24,8 @@ export default { -moz-osx-font-smoothing: grayscale; text-align: center; color: #2c3e50; + /* background-color: #e8ebef; */ } -.list { - padding: 30px; - display: inline-flex; -} -.list a { - font-weight: bold; - color: #2c3e50; - padding: 10px; -} - -.list a.router-link-exact-active { - color: #42b983; -} diff --git a/src/components/bid-record/BidRecordList.vue b/src/components/bid-record/BidRecordList.vue index b4bf918..33de51d 100644 --- a/src/components/bid-record/BidRecordList.vue +++ b/src/components/bid-record/BidRecordList.vue @@ -111,16 +111,14 @@
- - + + - - - +
Bil Jenis Karat Berat Harga Asas
Jumlah {{ theData.berat }}gRM{{ theData.hargaasas }}
diff --git a/src/components/bid-record/TheBidRecord.vue b/src/components/bid-record/TheBidRecord.vue index d9f0488..813c144 100644 --- a/src/components/bid-record/TheBidRecord.vue +++ b/src/components/bid-record/TheBidRecord.vue @@ -3,14 +3,15 @@
+

Rekod Bidaan Hari Ini : {{ date }}

+ + - -
REKOD BIDAAN HARI INI : {{date}}
@@ -50,4 +51,10 @@ export default { }, }, }; - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/components/cart/CartListNew.vue b/src/components/cart/CartListNew.vue index b67ec5c..1f7f657 100644 --- a/src/components/cart/CartListNew.vue +++ b/src/components/cart/CartListNew.vue @@ -184,7 +184,6 @@ Jenis Marhun Karat Berat - Nota Harga Asas {{ data.marhun }} {{ data.karat }} {{ data.berat }}g - {{ data.nota }} RM{{ data.hargaasas }} Jumlah {{ theSurat.berat }}g - RM{{ theSurat.hargaasas }} @@ -679,6 +676,14 @@ export default { .then((response) => { this.isLoading = false; if (response.data.success == true) { + this.$swal.fire({ + icon: "success", + title: "Surat Berjaya Dipadam", + confirmButtonColor: "#344871", + confirmButtonText: "OK", + allowOutsideClick: false, + allowEscapeKey: false, + }); this.$emit("reloadComponent"); } else if (response.data.success == false) { alert(response.data.message); @@ -701,8 +706,6 @@ export default { updateItem(value) { this.v$.$validate(); if (!this.v$.$error) { - this.$refs.editClose.click(); - this.isLoading = true; this.formEdit.lelongBidId = value.id; this.formEdit.hargabida = this.jumlahBidaan; axios @@ -712,7 +715,17 @@ export default { }, }) .then((response) => { + this.isLoading = true; + this.$refs.editClose.click(); console.log(response); + this.$swal.fire({ + icon: "success", + title: "Bidaan Berjaya Diubah", + confirmButtonColor: "#344871", + confirmButtonText: "OK", + allowOutsideClick: false, + allowEscapeKey: false, + }); this.isLoading = false; this.$emit("reloadComponent"); }) @@ -734,6 +747,15 @@ export default { }) .then((response) => { this.$refs.daftarBidaanClose.click(); + this.$swal.fire({ + icon: "success", + title: "Bidaan Berjaya Didaftarkan", + text: "Sila ke halaman rekod untuk senarai rekod bidaan.", + confirmButtonColor: "#344871", + confirmButtonText: "OK", + allowOutsideClick: false, + allowEscapeKey: false, + }); this.loading = false; console.log(response); this.$emit("reloadComponent"); @@ -744,7 +766,16 @@ export default { console.log(error); }); } else { - this.$refs.daftarBidaanOpen.click(); + this.$refs.daftarBidaanClose.click(); + this.$swal.fire({ + icon: "error", + title: "Gagal Daftar Bidaan", + text: "Sila tambah item ke dalam troli.", + confirmButtonColor: "#344871", + confirmButtonText: "OK", + allowOutsideClick: false, + allowEscapeKey: false, + }); } }, }, diff --git a/src/components/layouts/TheFooter.vue b/src/components/layouts/TheFooter.vue index f9babce..d9a81e7 100644 --- a/src/components/layouts/TheFooter.vue +++ b/src/components/layouts/TheFooter.vue @@ -28,8 +28,6 @@ " > - - @@ -39,24 +37,18 @@ >Permodalan Kelantan Berhad -
+ diff --git a/src/components/layouts/TheHeader.vue b/src/components/layouts/TheHeader.vue index 75f2da7..595070b 100644 --- a/src/components/layouts/TheHeader.vue +++ b/src/components/layouts/TheHeader.vue @@ -1,69 +1,74 @@ \ No newline at end of file diff --git a/src/components/list/ListItem.vue b/src/components/list/ListItem.vue index 218c485..461f96c 100644 --- a/src/components/list/ListItem.vue +++ b/src/components/list/ListItem.vue @@ -144,7 +144,7 @@ Jumlah {{ norujukan.berat }}g - + @@ -361,9 +361,18 @@ export default { }) .then((response) => { console.log(response); - this.loading = false; this.$emit("reloadComponent"); + this.$swal.fire({ + toast: true, + icon: "success", + title: "Berjaya Tambah Ke Troli", + animation: false, + position: "bottom", + showConfirmButton: false, + timer: 5000, + timerProgressBar: true, + }); // location.reload(); }) .catch((error) => { @@ -376,4 +385,10 @@ export default { }, }, }; - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/components/list/TheList.vue b/src/components/list/TheList.vue index 5de7acc..c75c811 100644 --- a/src/components/list/TheList.vue +++ b/src/components/list/TheList.vue @@ -1,7 +1,7 @@